movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-10 03:23:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

emacs: let hydra not build epkgs to speed up bumping default Emacs

Browse source 
Emacs 30 fixes two CVEs.  With this patch, bumping default Emacs
version can go to master instead of staging.
This commit is contained in:
Lin Jian 2025-03-02 02:56:58 +08:00
parent 53370ca116
commit f613377b44
No known key found for this signature in database
GPG key ID: A6698D36434F75A5
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
pkgs/top-level/aliases.nix
View file

@ -419,6 +419,7 @@ mapAliases {
emacsMacport = emacs-macport; # Added 2023-08-10 emacsMacport = emacs-macport; # Added 2023-08-10
emacsNativeComp = emacs28NativeComp; # Added 2022-06-08 emacsNativeComp = emacs28NativeComp; # Added 2022-06-08
emacsWithPackages = throw "'emacsWithPackages' has been renamed to/replaced by 'emacs.pkgs.withPackages'"; # Converted to throw 2024-10-17 emacsWithPackages = throw "'emacsWithPackages' has been renamed to/replaced by 'emacs.pkgs.withPackages'"; # Converted to throw 2024-10-17
emacsPackages = emacs.pkgs; # Added 2025-03-02
EmptyEpsilon = empty-epsilon; # Added 2024-07-14 EmptyEpsilon = empty-epsilon; # Added 2024-07-14
enyo-doom = enyo-launcher; # Added 2022-09-09 enyo-doom = enyo-launcher; # Added 2022-09-09

4
pkgs/top-level/all-packages.nix
View file

@ -13194,10 +13194,6 @@ with pkgs;
pkgs' = pkgs; # default pkgs used for bootstrapping the emacs package set 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.
# If you turn this into "real" alias again, please add it to pkgs/top-level/packages-config.nix again too
emacsPackages = emacs.pkgs // { __recurseIntoDerivationForReleaseJobs = true; };
epick = callPackage ../applications/graphics/epick { epick = callPackage ../applications/graphics/epick {
inherit (darwin.apple_sdk.frameworks) AppKit; inherit (darwin.apple_sdk.frameworks) AppKit;
}; };

4
pkgs/top-level/packages-config.nix
View file

@ -36,6 +36,10 @@
compiler = recurseIntoAttrs super.haskell.compiler; compiler = recurseIntoAttrs super.haskell.compiler;
}; };
# emacsPackages is an alias for emacs.pkgs
# Re-introduce emacsPackages here so that emacs.pkgs can be searched.
emacsPackages = emacs.pkgs;
# minimal-bootstrap packages aren't used for anything but bootstrapping our # minimal-bootstrap packages aren't used for anything but bootstrapping our
# stdenv. They should not be used for any other purpose and therefore not # stdenv. They should not be used for any other purpose and therefore not
# show up in search results or repository tracking services that consume our # show up in search results or repository tracking services that consume our