diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-31 10:26:45 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-31 10:27:54 +0200 |
| commit | 06af54c986e70bc08a160888e4fa16687ba67005 (patch) | |
| tree | 0d3a87c96c5130a6449c342c983029ae87875647 | |
| parent | ad1d58c6227abf2a9c80311eb09166a532384ed2 (diff) | |
| download | nixpkgs-06af54c986e70bc08a160888e4fa16687ba67005.tar nixpkgs-06af54c986e70bc08a160888e4fa16687ba67005.tar.gz nixpkgs-06af54c986e70bc08a160888e4fa16687ba67005.tar.bz2 nixpkgs-06af54c986e70bc08a160888e4fa16687ba67005.tar.lz nixpkgs-06af54c986e70bc08a160888e4fa16687ba67005.tar.xz nixpkgs-06af54c986e70bc08a160888e4fa16687ba67005.tar.zst nixpkgs-06af54c986e70bc08a160888e4fa16687ba67005.zip | |
Fixup merge by removing incorrect emacsXXPackages
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f9da5a2e027..fae08fcf5c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; |