public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

emacsPackages*: Move to emacs*.pkgs

Browse Source 
This makes it much easier to create customisations around emacs via
the a new convenience passthru attr:
- `emacs.pkgs`: What used to be emacsPackages is now `emacs.pkgs`

The previous versioned names `emacs*Packages` have been moved to
aliases.nix and are now considered deprecated in favour of `emacs*.pkgs`.
This commit is contained in:
adisbladis 2020-12-18 04:24:41 +01:00
parent 9e2880e5fa
commit 6347f78fd9
No known key found for this signature in database
GPG Key ID: 110BFAD44C6249B7
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/editors/emacs/generic.nix
View File

@ -11,6 +11,7 @@
, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux
, alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf , alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf
, jansson, harfbuzz , jansson, harfbuzz
, dontRecurseIntoAttrs ,emacsPackagesFor
, libgccjit, targetPlatform, makeWrapper # native-comp params , libgccjit, targetPlatform, makeWrapper # native-comp params
, systemd ? null , systemd ? null
, withX ? !stdenv.isDarwin , withX ? !stdenv.isDarwin
@ -40,9 +41,7 @@ assert withGTK3 -> !withGTK2 && gtk3-x11 != null;
assert withXwidgets -> withGTK3 && webkitgtk != null; assert withXwidgets -> withGTK3 && webkitgtk != null;
let let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp {
in stdenv.mkDerivation (lib.optionalAttrs nativeComp {
NATIVE_FULL_AOT = "1"; NATIVE_FULL_AOT = "1";
LIBRARY_PATH = "${lib.getLib stdenv.cc.libc}/lib"; LIBRARY_PATH = "${lib.getLib stdenv.cc.libc}/lib";
} // lib.optionalAttrs stdenv.isDarwin { } // lib.optionalAttrs stdenv.isDarwin {
@ -175,6 +174,7 @@ in stdenv.mkDerivation (lib.optionalAttrs nativeComp {
passthru = { passthru = {
inherit nativeComp; inherit nativeComp;
pkgs = dontRecurseIntoAttrs (emacsPackagesFor emacs);
}; };
meta = with lib; { meta = with lib; {
@ -201,4 +201,5 @@ in stdenv.mkDerivation (lib.optionalAttrs nativeComp {
separately. separately.
''; '';
}; };
}) });
in emacs

8
pkgs/top-level/aliases.nix
View File

@ -144,7 +144,13 @@ mapAliases ({
emacsPackagesGen = emacsPackagesFor; # added 2018-08-18 emacsPackagesGen = emacsPackagesFor; # added 2018-08-18
emacsPackagesNgGen = emacsPackagesFor; # added 2018-08-18 emacsPackagesNgGen = emacsPackagesFor; # added 2018-08-18
emacsPackagesNgFor = emacsPackagesFor; # added 2019-08-07 emacsPackagesNgFor = emacsPackagesFor; # added 2019-08-07
emacsPackagesNg = emacsPackages; # added 2019-08-07 emacsPackagesNg = emacs.pkgs; # added 2019-08-07
emacs26Packages = emacs26.pkgs; # added 2020-12-18
emacs27Packages = emacs27.pkgs; # added 2020-12-18
emacs26WithPackages = emacs26.pkgs.withPackages; # added 2020-12-18
emacs27WithPackages = emacs27.pkgs.withPackages; # added 2020-12-18
emacsWithPackages = emacs.pkgs.withPackages; # added 2020-12-18
emacsPackages = emacs.pkgs; # added 2020-12-18
emby = throw "The Emby derivation has been removed, see jellyfin instead for a free software fork."; # added 2019-05-01 emby = throw "The Emby derivation has been removed, see jellyfin instead for a free software fork."; # added 2019-05-01
enblendenfuse = enblend-enfuse; # 2015-09-30 enblendenfuse = enblend-enfuse; # 2015-09-30
evolution_data_server = evolution-data-server; # added 2018-02-25 evolution_data_server = evolution-data-server; # added 2018-02-25

5
pkgs/top-level/all-packages.nix
View File

@ -21497,11 +21497,6 @@ in
}; };
}; };
emacs26Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs26);
emacs27Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs27);
emacs26WithPackages = emacs26Packages.emacsWithPackages;
emacs27WithPackages = emacs27Packages.emacsWithPackages;
inherit (gnome3) empathy; inherit (gnome3) empathy;
enhanced-ctorrent = callPackage ../applications/networking/enhanced-ctorrent { }; enhanced-ctorrent = callPackage ../applications/networking/enhanced-ctorrent { };

1
pkgs/top-level/emacs-packages.nix
View File

@ -82,5 +82,6 @@ in lib.makeScope newScope (self: lib.makeOverridable ({
// { // {
inherit emacs melpaBuild trivialBuild; inherit emacs melpaBuild trivialBuild;
emacsWithPackages = emacsWithPackages self; emacsWithPackages = emacsWithPackages self;
withPackages = emacsWithPackages self;
}) })
) {}) ) {})