Skip to content

Commit f613377

Browse files
committed
emacs: let hydra not build epkgs to speed up bumping default Emacs
Emacs 30 fixes two CVEs. With this patch, bumping default Emacs version can go to master instead of staging.
1 parent 53370ca commit f613377

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

pkgs/top-level/aliases.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -419,6 +419,7 @@ mapAliases {
419419
emacsMacport = emacs-macport; # Added 2023-08-10
420420
emacsNativeComp = emacs28NativeComp; # Added 2022-06-08
421421
emacsWithPackages = throw "'emacsWithPackages' has been renamed to/replaced by 'emacs.pkgs.withPackages'"; # Converted to throw 2024-10-17
422+
emacsPackages = emacs.pkgs; # Added 2025-03-02
422423

423424
EmptyEpsilon = empty-epsilon; # Added 2024-07-14
424425
enyo-doom = enyo-launcher; # Added 2022-09-09

pkgs/top-level/all-packages.nix

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13194,10 +13194,6 @@ with pkgs;
1319413194
pkgs' = pkgs; # default pkgs used for bootstrapping the emacs package set
1319513195
};
1319613196

13197-
# This alias should live in aliases.nix but that would cause Hydra not to evaluate/build the packages.
13198-
# If you turn this into "real" alias again, please add it to pkgs/top-level/packages-config.nix again too
13199-
emacsPackages = emacs.pkgs // { __recurseIntoDerivationForReleaseJobs = true; };
13200-
1320113197
epick = callPackage ../applications/graphics/epick {
1320213198
inherit (darwin.apple_sdk.frameworks) AppKit;
1320313199
};

pkgs/top-level/packages-config.nix

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@
3636
compiler = recurseIntoAttrs super.haskell.compiler;
3737
};
3838

39+
# emacsPackages is an alias for emacs.pkgs
40+
# Re-introduce emacsPackages here so that emacs.pkgs can be searched.
41+
emacsPackages = emacs.pkgs;
42+
3943
# minimal-bootstrap packages aren't used for anything but bootstrapping our
4044
# stdenv. They should not be used for any other purpose and therefore not
4145
# show up in search results or repository tracking services that consume our

0 commit comments

Comments
 (0)