public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

emacs: emacs26 -> emacs27

Browse Source 
The attribute names were wrong
This commit is contained in:
adisbladis 2020-08-21 00:22:18 +02:00
parent 13276abce9
commit d339f8379d
No known key found for this signature in database
GPG Key ID: 110BFAD44C6249B7
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/editors/emacs-modes/updater-emacs.nix
View File

@ -1,7 +1,7 @@
let let
pkgs = import ../../../.. {}; pkgs = import ../../../.. {};
emacsEnv = (pkgs.emacsPackagesFor pkgs.emacs26).emacsWithPackages (epkgs: let emacsEnv = (pkgs.emacsPackagesFor pkgs.emacs).emacsWithPackages (epkgs: let
promise = epkgs.trivialBuild { promise = epkgs.trivialBuild {
pname = "promise"; pname = "promise";

14
pkgs/top-level/all-packages.nix
View File

@ -19878,11 +19878,11 @@ in
elvis = callPackage ../applications/editors/elvis { }; elvis = callPackage ../applications/editors/elvis { };
emacs = emacs26; emacs = emacs27;
emacsPackages = emacs26Packages; emacsPackages = emacs27Packages;
emacs-nox = emacs26-nox; emacs-nox = emacs27-nox;
emacs26 = callPackage ../applications/editors/emacs { emacs27 = callPackage ../applications/editors/emacs {
# use override to enable additional features # use override to enable additional features
libXaw = xorg.libXaw; libXaw = xorg.libXaw;
Xaw3d = null; Xaw3d = null;
@ -19894,7 +19894,7 @@ in
inherit (darwin.apple_sdk.frameworks) AppKit GSS ImageIO; inherit (darwin.apple_sdk.frameworks) AppKit GSS ImageIO;
}; };
emacs26-nox = lowPrio (appendToName "nox" (emacs26.override { emacs27-nox = lowPrio (appendToName "nox" (emacs27.override {
withX = false; withX = false;
withNS = false; withNS = false;
withGTK2 = false; withGTK2 = false;
@ -19932,9 +19932,9 @@ in
}; };
}; };
emacs26Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs26); emacs27Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs27);
emacs26WithPackages = emacs26Packages.emacsWithPackages; emacs27WithPackages = emacs27Packages.emacsWithPackages;
emacsWithPackages = emacsPackages.emacsWithPackages; emacsWithPackages = emacsPackages.emacsWithPackages;
inherit (gnome3) empathy; inherit (gnome3) empathy;