From 6005107c0b524cc4482e877d25ea5a5aa56d637d Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Thu, 8 Sep 2022 20:53:05 +0100
Subject: [PATCH] Refactor flake.nix to use the new standard inputs

---
 checks.nix |  9 ++-------
 flake.nix  | 19 +++++++++++++------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/checks.nix b/checks.nix
index d12a28d..8341a8d 100644
--- a/checks.nix
+++ b/checks.nix
@@ -32,13 +32,8 @@ in
       };
     };
   }).activationPackage;
-  init-example-el = self.outputs.package.${system} {
-    doomPrivateDir = ./test/doom.d;
-    dependencyOverrides = inputs;
-  };
-  init-example-el-emacsGit = self.outputs.package.${system} {
-    doomPrivateDir = ./test/doom.d;
-    dependencyOverrides = inputs;
+  init-example-el = self.outputs.packages.${system}.nix-doom-emacs;
+  init-example-el-emacsGit = self.outputs.packages.${system}.nix-doom-emacs.override {
     emacsPackages = with pkgs; emacsPackagesFor emacsGit;
   };
 }
diff --git a/flake.nix b/flake.nix
index b8bc8e4..6c72d43 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,8 +2,8 @@
 
    {
      inputs = {
-       home-manager.url = "github:rycee/home-manager";
-       nix-doom-emacs.url = "github:nix-community/nix-doom-emacs/flake";
+       home-manager.url = "github:nix-community/home-manager";
+       nix-doom-emacs.url = "github:nix-community/nix-doom-emacs";
      };
 
      outputs = {
@@ -92,13 +92,20 @@
     in eachDefaultSystem (system:
       let pkgs = import nixpkgs { inherit system; };
       in {
-        devShell = pkgs.mkShell {
+        devShells.default = pkgs.mkShell {
           buildInputs =
             [ (pkgs.python3.withPackages (ps: with ps; [ PyGithub ])) ];
         };
-        package = { dependencyOverrides ? { }, ... }@args:
-          pkgs.callPackage self
-          (args // { dependencyOverrides = (inputs // dependencyOverrides); });
+        # TODO: remove this after NixOS 23.05 is released
+        package = { ... }@args:
+          pkgs.lib.warn "Deprecated, please use `packages.${system}.default` instead!"
+          (pkgs.callPackage self args);
+        packages = {
+          default = self.outputs.packages.${system}.nix-doom-emacs;
+          nix-doom-emacs = pkgs.callPackage self {
+            doomPrivateDir = ./test/doom.d;
+          };
+        };
         checks = import ./checks.nix { inherit system; } inputs;
       }) // {
         hmModule = import ./modules/home-manager.nix inputs;