From e6112d24d0fc9764ec1c4ff76246382a64ffe002 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 1 Nov 2025 12:31:56 +0100 Subject: [PATCH] emacsPackages: revert throw We recently retired a lot of old aliases, but emacsPackages is still exposed on search.nixos.org, so should not have been removed. I argued previously, that this should not have been an alias in the first place: If it's exposed on search.nixos.org, then it is expected to be used, too. We will also need that once we teach Eval to evaluate more packages than hydra builds. --- pkgs/top-level/aliases.nix | 1 - pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b4a6e14d7d4e0..34f3fa5abc805 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -520,7 +520,6 @@ mapAliases { elm-github-install = throw "'elm-github-install' has been removed as it is abandoned upstream and only supports Elm 0.18.0"; # Added 2025-08-25 emacsMacport = throw "'emacsMacport' has been renamed to/replaced by 'emacs-macport'"; # Converted to throw 2025-10-27 emacsNativeComp = throw "'emacsNativeComp' has been renamed to/replaced by 'emacs'"; # Converted to throw 2025-10-27 - emacsPackages = throw "'emacsPackages' has been renamed to/replaced by 'emacs.pkgs'"; # Converted to throw 2025-10-27 embree2 = throw "embree2 has been removed, as it is unmaintained upstream and depended on tbb_2020"; # Added 2025-09-14 EmptyEpsilon = throw "'EmptyEpsilon' has been renamed to/replaced by 'empty-epsilon'"; # Converted to throw 2025-10-27 emulationstation = throw "emulationstation was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45ea67a634f34..7e69b55e6fcb8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10937,6 +10937,10 @@ with pkgs; pkgs' = pkgs; # default pkgs used for bootstrapping the emacs package set }; + # emacsPackages is exposed on search.nixos.org. + # Also see pkgs/top-level/packages-config.nix + emacsPackages = dontRecurseIntoAttrs emacs.pkgs; + espeak-classic = callPackage ../applications/audio/espeak { }; espeak = espeak-ng;