diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index 1f49c3c23af0..4243ad47a243 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -11,7 +11,7 @@ , libtiff, librsvg, libwebp, gconf, libxml2, imagemagick, gnutls, libselinux , alsa-lib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf , sigtool, jansson, harfbuzz, sqlite, nixosTests -, dontRecurseIntoAttrs, emacsPackagesFor +, recurseIntoAttrs, emacsPackagesFor , libgccjit, targetPlatform, makeWrapper # native-comp params , fetchFromSavannah , systemd ? null @@ -216,7 +216,7 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { passthru = { inherit nativeComp; - pkgs = dontRecurseIntoAttrs (emacsPackagesFor emacs); + pkgs = recurseIntoAttrs (emacsPackagesFor emacs); tests = { inherit (nixosTests) emacs-daemon; }; }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 631ff2c3e596..dcc7db2e2b5e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -384,7 +384,6 @@ mapAliases ({ emacs28Packages = emacs28.pkgs; # Added 2021-10-04 emacs28WithPackages = emacs28.pkgs.withPackages; # Added 2021-10-04 emacsNativeComp = emacs28NativeComp; # Added 2022-06-08 - emacsPackages = emacs.pkgs; # Added 2020-12-18 emacsPackagesGen = throw "'emacsPackagesGen' has been renamed to/replaced by 'emacsPackagesFor'"; # Converted to throw 2022-02-22 emacsPackagesNg = emacs.pkgs; # Added 2019-08-07 emacsPackagesNgFor = emacsPackagesFor; # Added 2019-08-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b65c1b12fa6a..8ccf7e6dcb63 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27030,6 +27030,9 @@ with pkgs; pkgs' = pkgs; # default pkgs used for bootstrapping the emacs package set }; + # This alias should live in aliases.nix but that would cause Hydra not to evaluate/build the packages. + emacsPackages = emacs.pkgs; + inherit (gnome) empathy; enhanced-ctorrent = callPackage ../applications/networking/enhanced-ctorrent { };