movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

emacs: default to 30 (#386348)

Browse source
This commit is contained in:
Lin Jian 2025-03-03 11:37:44 +08:00 • committed by GitHub
commit 2075894398
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 9 additions and 7 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

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

@ -13186,9 +13186,10 @@ with pkgs;
; ;
emacs-macport = emacs29-macport; emacs-macport = emacs29-macport;
emacs = emacs29; emacs = emacs30;
emacs-gtk = emacs29-gtk3; emacs-gtk = emacs30-gtk3;
emacs-nox = emacs29-nox; emacs-nox = emacs30-nox;
emacs-pgtk = emacs30-pgtk;
emacsPackagesFor = emacs: import ./emacs-packages.nix { emacsPackagesFor = emacs: import ./emacs-packages.nix {
inherit (lib) makeScope makeOverridable dontRecurseIntoAttrs; inherit (lib) makeScope makeOverridable dontRecurseIntoAttrs;
@ -13196,10 +13197,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