From d339f8379d14e25e29206b945787ec010047f08d Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Fri, 21 Aug 2020 00:22:18 +0200
Subject: [PATCH] emacs: emacs26 -> emacs27
The attribute names were wrong
---
.../editors/emacs-modes/updater-emacs.nix | 2 +-
pkgs/top-level/all-packages.nix | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/pkgs/applications/editors/emacs-modes/updater-emacs.nix b/pkgs/applications/editors/emacs-modes/updater-emacs.nix
index 518ee67e4512..b5de993eaa76 100644
--- a/pkgs/applications/editors/emacs-modes/updater-emacs.nix
+++ b/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/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e3fee57f252b..2b1f8345caf5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19878,11 +19878,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;
@@ -19894,7 +19894,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;
@@ -19932,9 +19932,9 @@ in
};
};
- emacs26Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs26);
+ emacs27Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs27);
- emacs26WithPackages = emacs26Packages.emacsWithPackages;
+ emacs27WithPackages = emacs27Packages.emacsWithPackages;
emacsWithPackages = emacsPackages.emacsWithPackages;
inherit (gnome3) empathy;