mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-19 11:23:29 +00:00
Fixup merge by removing incorrect emacsXXPackages
This commit is contained in:
parent
ad1d58c622
commit
06af54c986
@ -17970,9 +17970,6 @@ in
|
||||
stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
|
||||
};
|
||||
|
||||
emacs25Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs25 pkgs.emacs25Packages);
|
||||
emacs26Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs26 pkgs.emacs26Packages);
|
||||
|
||||
emacsPackagesFor = emacs: import ./emacs-packages.nix {
|
||||
inherit lib newScope stdenv pkgs;
|
||||
inherit fetchFromGitHub fetchurl;
|
||||
|
Loading…
Reference in New Issue
Block a user