diff options
| author | adisbladis <adisbladis@gmail.com> | 2020-08-21 00:22:18 +0200 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-10-01 16:36:44 +0000 |
| commit | fc8104e46b5fd7a0492e007a6691336fa8b31c10 (patch) | |
| tree | 4e5a7642d64e0d4c734851b5ae92b682181e7bd8 /nixpkgs | |
| parent | d86f885ba9ff514e19970dea97cf1d8becc38080 (diff) | |
| download | nixlib-fc8104e46b5fd7a0492e007a6691336fa8b31c10.tar nixlib-fc8104e46b5fd7a0492e007a6691336fa8b31c10.tar.gz nixlib-fc8104e46b5fd7a0492e007a6691336fa8b31c10.tar.bz2 nixlib-fc8104e46b5fd7a0492e007a6691336fa8b31c10.tar.lz nixlib-fc8104e46b5fd7a0492e007a6691336fa8b31c10.tar.xz nixlib-fc8104e46b5fd7a0492e007a6691336fa8b31c10.tar.zst nixlib-fc8104e46b5fd7a0492e007a6691336fa8b31c10.zip | |
emacs: emacs26 -> emacs27
The attribute names were wrong (cherry picked from commit d339f8379d14e25e29206b945787ec010047f08d)
Diffstat (limited to 'nixpkgs')
| -rw-r--r-- | nixpkgs/pkgs/applications/editors/emacs-modes/updater-emacs.nix | 2 | ||||
| -rw-r--r-- | nixpkgs/pkgs/top-level/all-packages.nix | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/updater-emacs.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/updater-emacs.nix index 518ee67e4512..b5de993eaa76 100644 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/updater-emacs.nix +++ b/nixpkgs/pkgs/applications/editors/emacs-modes/updater-emacs.nix @@ -1,7 +1,7 @@ let pkgs = import ../../../.. {}; - emacsEnv = (pkgs.emacsPackagesFor pkgs.emacs26).emacsWithPackages (epkgs: let + emacsEnv = (pkgs.emacsPackagesFor pkgs.emacs).emacsWithPackages (epkgs: let promise = epkgs.trivialBuild { pname = "promise"; diff --git a/nixpkgs/pkgs/top-level/all-packages.nix b/nixpkgs/pkgs/top-level/all-packages.nix index 65f8a974bde9..c4c8bad50644 100644 --- a/nixpkgs/pkgs/top-level/all-packages.nix +++ b/nixpkgs/pkgs/top-level/all-packages.nix @@ -19395,11 +19395,11 @@ in elvis = callPackage ../applications/editors/elvis { }; - emacs = emacs26; - emacsPackages = emacs26Packages; - emacs-nox = emacs26-nox; + emacs = emacs27; + emacsPackages = emacs27Packages; + emacs-nox = emacs27-nox; - emacs26 = callPackage ../applications/editors/emacs { + emacs27 = callPackage ../applications/editors/emacs { # use override to enable additional features libXaw = xorg.libXaw; Xaw3d = null; @@ -19411,7 +19411,7 @@ in inherit (darwin.apple_sdk.frameworks) AppKit GSS ImageIO; }; - emacs26-nox = lowPrio (appendToName "nox" (emacs26.override { + emacs27-nox = lowPrio (appendToName "nox" (emacs27.override { withX = false; withNS = false; withGTK2 = false; @@ -19449,9 +19449,9 @@ in }; }; - emacs26Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs26); + emacs27Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs27); - emacs26WithPackages = emacs26Packages.emacsWithPackages; + emacs27WithPackages = emacs27Packages.emacsWithPackages; emacsWithPackages = emacsPackages.emacsWithPackages; inherit (gnome3) empathy; |