eeva/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager synced 2024-11-23 11:39:46 +01:00
Code Issues Releases Wiki Activity

emacs: remove custom emacsPackages

Browse source 
We can now directly use the existing package set since it supports
overrides.
This commit is contained in:
Robert Helgesson 2021-09-30 23:46:36 +02:00
parent 959217e51d
commit 677f1f05df
No known key found for this signature in database
GPG key ID: 36BDAA14C2797E89
5 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/programs/emacs.nix
View file

@ -6,11 +6,7 @@ let
cfg = config.programs.emacs; cfg = config.programs.emacs;
# Copied from all-packages.nix, with modifications to support emacsPackages = cfg.package.pkgs.overrideScope' cfg.overrides;
# overrides.
emacsPackages = let epkgs = pkgs.emacsPackagesFor cfg.package;
in epkgs.overrideScope' cfg.overrides;
emacsWithPackages = emacsPackages.emacsWithPackages; emacsWithPackages = emacsPackages.emacsWithPackages;
createConfPackage = epkgs: createConfPackage = epkgs:

4
tests/modules/services/emacs/emacs-service-27.nix
View file

@ -8,9 +8,9 @@ with lib;
(self: super: rec { (self: super: rec {
emacs = pkgs.writeShellScriptBin "dummy-emacs-27.2" "" // { emacs = pkgs.writeShellScriptBin "dummy-emacs-27.2" "" // {
outPath = "@emacs@"; outPath = "@emacs@";
}; pkgs =
emacsPackagesFor = _:
makeScope super.newScope (_: { emacsWithPackages = _: emacs; }); makeScope super.newScope (_: { emacsWithPackages = _: emacs; });
};
}) })
]; ];

4
tests/modules/services/emacs/emacs-service-28.nix
View file

@ -8,9 +8,9 @@ with lib;
(self: super: rec { (self: super: rec {
emacs = pkgs.writeShellScriptBin "dummy-emacs-28.0.5" "" // { emacs = pkgs.writeShellScriptBin "dummy-emacs-28.0.5" "" // {
outPath = "@emacs@"; outPath = "@emacs@";
}; pkgs =
emacsPackagesFor = _:
makeScope super.newScope (_: { emacsWithPackages = _: emacs; }); makeScope super.newScope (_: { emacsWithPackages = _: emacs; });
};
}) })
]; ];

4
tests/modules/services/emacs/emacs-socket-27.nix
View file

@ -10,9 +10,9 @@ in {
(self: super: rec { (self: super: rec {
emacs = pkgs.writeShellScriptBin "dummy-emacs-27.2" "" // { emacs = pkgs.writeShellScriptBin "dummy-emacs-27.2" "" // {
outPath = "@emacs@"; outPath = "@emacs@";
}; pkgs =
emacsPackagesFor = _:
makeScope super.newScope (_: { emacsWithPackages = _: emacs; }); makeScope super.newScope (_: { emacsWithPackages = _: emacs; });
};
}) })
]; ];

4
tests/modules/services/emacs/emacs-socket-28.nix
View file

@ -10,9 +10,9 @@ in {
(self: super: rec { (self: super: rec {
emacs = pkgs.writeShellScriptBin "dummy-emacs-28.0.5" "" // { emacs = pkgs.writeShellScriptBin "dummy-emacs-28.0.5" "" // {
outPath = "@emacs@"; outPath = "@emacs@";
}; pkgs =
emacsPackagesFor = _:
makeScope super.newScope (_: { emacsWithPackages = _: emacs; }); makeScope super.newScope (_: { emacsWithPackages = _: emacs; });
};
}) })
]; ];