From c54c8f8dfa382b9ecac1dcab2838aa16f4831b72 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 2 Mar 2021 16:16:02 +0200 Subject: [PATCH] emacs26: Drop unsupported package --- pkgs/applications/editors/emacs/26.nix | 7 ------- pkgs/top-level/aliases.nix | 2 -- pkgs/top-level/all-packages.nix | 19 ------------------- pkgs/top-level/packages-config.nix | 1 - 4 files changed, 29 deletions(-) delete mode 100644 pkgs/applications/editors/emacs/26.nix diff --git a/pkgs/applications/editors/emacs/26.nix b/pkgs/applications/editors/emacs/26.nix deleted file mode 100644 index 1667bec9932..00000000000 --- a/pkgs/applications/editors/emacs/26.nix +++ /dev/null @@ -1,7 +0,0 @@ -import ./generic.nix (rec { - version = "26.3"; - sha256 = "119ldpk7sgn9jlpyngv5y4z3i7bb8q3xp4p0qqi7i5nq39syd42d"; - patches = [ - ./tramp-detect-wrapped-gvfsd-26.patch - ]; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1349ce99341..7f6990c4ffb 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -166,9 +166,7 @@ mapAliases ({ emacsPackagesNgGen = emacsPackagesFor; # added 2018-08-18 emacsPackagesNgFor = emacsPackagesFor; # added 2019-08-07 emacsPackagesNg = emacs.pkgs; # added 2019-08-07 - emacs26Packages = emacs26.pkgs; # added 2020-12-18 emacs27Packages = emacs27.pkgs; # added 2020-12-18 - emacs26WithPackages = emacs26.pkgs.withPackages; # added 2020-12-18 emacs27WithPackages = emacs27.pkgs.withPackages; # added 2020-12-18 emacsWithPackages = emacs.pkgs.withPackages; # added 2020-12-18 emacsPackages = emacs.pkgs; # added 2020-12-18 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c1849edcb4..51c3b400242 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21978,25 +21978,6 @@ in withGTK3 = false; })); - emacs26 = callPackage ../applications/editors/emacs/26.nix { - # use override to enable additional features - libXaw = xorg.libXaw; - Xaw3d = null; - gconf = null; - alsaLib = null; - imagemagick = null; - acl = null; - gpm = null; - inherit (darwin.apple_sdk.frameworks) AppKit GSS ImageIO; - }; - - emacs26-nox = lowPrio (appendToName "nox" (emacs26.override { - withX = false; - withNS = false; - withGTK2 = false; - withGTK3 = false; - })); - emacsMacport = callPackage ../applications/editors/emacs/macport.nix { inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit diff --git a/pkgs/top-level/packages-config.nix b/pkgs/top-level/packages-config.nix index d0a71c43a96..84db6fa21ee 100644 --- a/pkgs/top-level/packages-config.nix +++ b/pkgs/top-level/packages-config.nix @@ -34,7 +34,6 @@ "nvidiaPackages" "sourceHanPackages" "atomPackages" - "emacs26.pkgs" "emacs27.pkgs" "steamPackages" "ut2004Packages"