Skip to content

Commit 2075894

Browse files
authored
emacs: default to 30 (#386348)
2 parents 9afb750 + 4347ffb commit 2075894

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
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: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13186,20 +13186,17 @@ with pkgs;
1318613186
;
1318713187

1318813188
emacs-macport = emacs29-macport;
13189-
emacs = emacs29;
13190-
emacs-gtk = emacs29-gtk3;
13191-
emacs-nox = emacs29-nox;
13189+
emacs = emacs30;
13190+
emacs-gtk = emacs30-gtk3;
13191+
emacs-nox = emacs30-nox;
13192+
emacs-pgtk = emacs30-pgtk;
1319213193

1319313194
emacsPackagesFor = emacs: import ./emacs-packages.nix {
1319413195
inherit (lib) makeScope makeOverridable dontRecurseIntoAttrs;
1319513196
emacs' = emacs;
1319613197
pkgs' = pkgs; # default pkgs used for bootstrapping the emacs package set
1319713198
};
1319813199

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

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)