BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #188110 from adisbladis/build-emacs-packages

Browse source 
emacs: Build emacs packages on Hydra
This commit is contained in:
Anderson Torres 2022-08-25 00:47:15 -03:00 committed by GitHub
commit 9dd005e188
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/editors/emacs/generic.nix
View file

@ -11,7 +11,7 @@
, libtiff, librsvg, libwebp, gconf, libxml2, imagemagick, gnutls, libselinux
, alsa-lib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf
, sigtool, jansson, harfbuzz, sqlite, nixosTests
, dontRecurseIntoAttrs, emacsPackagesFor
, recurseIntoAttrs, emacsPackagesFor
, libgccjit, targetPlatform, makeWrapper # native-comp params
, fetchFromSavannah
, systemd ? null
@ -216,7 +216,7 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp {
passthru = {
inherit nativeComp;
pkgs = dontRecurseIntoAttrs (emacsPackagesFor emacs);
pkgs = recurseIntoAttrs (emacsPackagesFor emacs);
tests = { inherit (nixosTests) emacs-daemon; };
};

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

@ -384,7 +384,6 @@ mapAliases ({
emacs28Packages = emacs28.pkgs; # Added 2021-10-04
emacs28WithPackages = emacs28.pkgs.withPackages; # Added 2021-10-04
emacsNativeComp = emacs28NativeComp; # Added 2022-06-08
emacsPackages = emacs.pkgs; # Added 2020-12-18
emacsPackagesGen = throw "'emacsPackagesGen' has been renamed to/replaced by 'emacsPackagesFor'"; # Converted to throw 2022-02-22
emacsPackagesNg = emacs.pkgs; # Added 2019-08-07
emacsPackagesNgFor = emacsPackagesFor; # Added 2019-08-07

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

@ -27030,6 +27030,9 @@ with pkgs;
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.
emacsPackages = emacs.pkgs;
inherit (gnome) empathy;
enhanced-ctorrent = callPackage ../applications/networking/enhanced-ctorrent { };