From 827fe858bcc75a5700683f5ed25ef44a773e9781 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 8 Sep 2022 20:36:11 +0100 Subject: [PATCH 1/7] Fix formatting --- modules/home-manager.nix | 4 ++-- overrides.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/home-manager.nix b/modules/home-manager.nix index 63ab768..4cd024b 100644 --- a/modules/home-manager.nix +++ b/modules/home-manager.nix @@ -65,8 +65,8 @@ in package customization. ''; type = with types; overlayType; - default = self: super: { }; - defaultText = "self: super { }"; + default = self: super: { }; + defaultText = "self: super { }"; example = literalExample '' self: super: { magit-delta = super.magit-delta.overrideAttrs (esuper: { diff --git a/overrides.nix b/overrides.nix index 08f15c5..fa4d63d 100644 --- a/overrides.nix +++ b/overrides.nix @@ -11,7 +11,7 @@ self: super: { doom-snippets = self.straightBuild { pname = "doom-snippets"; postInstall = '' - cp -r *-mode $out/share/emacs/site-lisp + cp -r *-mode $out/share/emacs/site-lisp ''; }; From 6005107c0b524cc4482e877d25ea5a5aa56d637d Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 8 Sep 2022 20:53:05 +0100 Subject: [PATCH 2/7] 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; From b434c1c1e27847658e27640dbfc6b7c215b9a7f7 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 8 Sep 2022 21:10:48 +0100 Subject: [PATCH 3/7] Add apps output --- flake.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/flake.nix b/flake.nix index 6c72d43..9bcf52e 100644 --- a/flake.nix +++ b/flake.nix @@ -92,14 +92,24 @@ in eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; }; in { + apps = { + default = self.outputs.apps.${system}.nix-doom-emacs; + nix-doom-emacs = flake-utils.lib.mkApp { + drv = self.outputs.packages.${system}.nix-doom-emacs; + exePath = "/bin/emacs"; + }; + }; + devShells.default = pkgs.mkShell { buildInputs = [ (pkgs.python3.withPackages (ps: with ps; [ PyGithub ])) ]; }; + # 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 { From 42acf72d86cbba67a3bd534382d6ee4d281477de Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 8 Sep 2022 21:12:36 +0100 Subject: [PATCH 4/7] packages.nix-doom-emacs -> packages.doom-emacs --- checks.nix | 4 ++-- flake.nix | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/checks.nix b/checks.nix index 8341a8d..b949d64 100644 --- a/checks.nix +++ b/checks.nix @@ -32,8 +32,8 @@ in }; }; }).activationPackage; - init-example-el = self.outputs.packages.${system}.nix-doom-emacs; - init-example-el-emacsGit = self.outputs.packages.${system}.nix-doom-emacs.override { + init-example-el = self.outputs.packages.${system}.doom-emacs; + init-example-el-emacsGit = self.outputs.packages.${system}.doom-emacs.override { emacsPackages = with pkgs; emacsPackagesFor emacsGit; }; } diff --git a/flake.nix b/flake.nix index 9bcf52e..61e92ae 100644 --- a/flake.nix +++ b/flake.nix @@ -93,9 +93,9 @@ let pkgs = import nixpkgs { inherit system; }; in { apps = { - default = self.outputs.apps.${system}.nix-doom-emacs; - nix-doom-emacs = flake-utils.lib.mkApp { - drv = self.outputs.packages.${system}.nix-doom-emacs; + default = self.outputs.apps.${system}.doom-emacs; + doom-emacs = flake-utils.lib.mkApp { + drv = self.outputs.packages.${system}.doom-emacs; exePath = "/bin/emacs"; }; }; @@ -111,8 +111,8 @@ (pkgs.callPackage self args); packages = { - default = self.outputs.packages.${system}.nix-doom-emacs; - nix-doom-emacs = pkgs.callPackage self { + default = self.outputs.packages.${system}.doom-emacs; + doom-emacs = pkgs.callPackage self { doomPrivateDir = ./test/doom.d; }; }; From 814450634e71a79bdd8d930dbff36a73dc68bc09 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 8 Sep 2022 21:41:21 +0100 Subject: [PATCH 5/7] Rename overlay parameters to `final: prev:` --- default.nix | 4 ++-- modules/home-manager.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/default.nix b/default.nix index 3db5fa5..fdbfe2f 100644 --- a/default.nix +++ b/default.nix @@ -29,13 +29,13 @@ See overrides.nix for addition examples. Example: - emacsPackagesOverlay = self: super: { + emacsPackagesOverlay = final: prev: { magit-delta = super.magit-delta.overrideAttrs (esuper: { buildInputs = esuper.buildInputs ++ [ pkgs.git ]; }); }; */ -, emacsPackagesOverlay ? self: super: { } +, emacsPackagesOverlay ? final: prev: { } /* Use bundled revision of github.com/nix-community/emacs-overlay as `emacsPackages`. */ diff --git a/modules/home-manager.nix b/modules/home-manager.nix index 4cd024b..7a69671 100644 --- a/modules/home-manager.nix +++ b/modules/home-manager.nix @@ -65,10 +65,10 @@ in package customization. ''; type = with types; overlayType; - default = self: super: { }; - defaultText = "self: super { }"; + default = final: prev: { }; + defaultText = "final: prev: { }"; example = literalExample '' - self: super: { + final: prev: { magit-delta = super.magit-delta.overrideAttrs (esuper: { buildInputs = esuper.buildInputs ++ [ pkgs.git ]; }); From 3e63d485143100e13ff87502f2740170de9a3f4b Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Fri, 9 Sep 2022 23:18:05 +0100 Subject: [PATCH 6/7] Review suggestion fixes --- checks.nix | 5 +++-- flake.nix | 20 +++++++++++--------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/checks.nix b/checks.nix index b949d64..608a36c 100644 --- a/checks.nix +++ b/checks.nix @@ -2,6 +2,7 @@ { self, nixpkgs, emacs-overlay, ... }@inputs: let + inherit (self.outputs.packages.${system}) doom-emacs-example; pkgs = import nixpkgs { inherit system; # we are not using emacs-overlay's flake.nix here, @@ -32,8 +33,8 @@ in }; }; }).activationPackage; - init-example-el = self.outputs.packages.${system}.doom-emacs; - init-example-el-emacsGit = self.outputs.packages.${system}.doom-emacs.override { + init-example-el = doom-emacs-example; + init-example-el-emacsGit = doom-emacs-example.override { emacsPackages = with pkgs; emacsPackagesFor emacsGit; }; } diff --git a/flake.nix b/flake.nix index 61e92ae..b749ac0 100644 --- a/flake.nix +++ b/flake.nix @@ -87,15 +87,15 @@ flake-compat.flake = false; }; - outputs = { self, nixpkgs, flake-utils, emacs-overlay, ... }@inputs: - let inherit (flake-utils.lib) eachDefaultSystem eachSystem; + outputs = { self, nixpkgs, flake-utils, ... }@inputs: + let inherit (flake-utils.lib) eachDefaultSystem mkApp; in eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; }; in { apps = { - default = self.outputs.apps.${system}.doom-emacs; - doom-emacs = flake-utils.lib.mkApp { - drv = self.outputs.packages.${system}.doom-emacs; + default = self.outputs.apps.${system}.doom-emacs-example; + doom-emacs-example = mkApp { + drv = self.outputs.packages.${system}.doom-emacs-example; exePath = "/bin/emacs"; }; }; @@ -105,14 +105,16 @@ [ (pkgs.python3.withPackages (ps: with ps; [ PyGithub ])) ]; }; - # TODO: remove this after NixOS 23.05 is released package = { ... }@args: - pkgs.lib.warn "Deprecated, please use `packages.${system}.default` instead!" + pkgs.lib.warn '' + Deprecated, will be removed after NixOS 23.05 release. + Please use `packages.${system}.default` instead! + '' (pkgs.callPackage self args); packages = { - default = self.outputs.packages.${system}.doom-emacs; - doom-emacs = pkgs.callPackage self { + default = self.outputs.packages.${system}.doom-emacs-example; + doom-emacs-example = pkgs.callPackage self { doomPrivateDir = ./test/doom.d; }; }; From a97a4e704bdb227eeab1b5aa9f26cafc61b40780 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sun, 11 Sep 2022 12:32:30 +0100 Subject: [PATCH 7/7] Improve warn message --- flake.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index b749ac0..6d3d7ac 100644 --- a/flake.nix +++ b/flake.nix @@ -107,8 +107,10 @@ package = { ... }@args: pkgs.lib.warn '' - Deprecated, will be removed after NixOS 23.05 release. - Please use `packages.${system}.default` instead! + nix-doom-emacs no longer supports the deprecated `package` flake output. + It will be removed after the release of NixOS 23.05. + + Please use `packages.${system}.default.override { ... }` instead! '' (pkgs.callPackage self args);