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

Merge pull request #330763 from linj-fork/pr/move-elpaBuild

Browse Source 
emacs: move elpaBuild together with other builders
This commit is contained in:
adisbladis
2024-07-30 15:41:06 +12:00
committed by GitHub
parent 46a2e084af dfac396c77
commit a2e8968589
3 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix
+2 -7
View File
@@ -22,7 +22,7 @@ formats commits for you.
*/
{ lib, stdenv, texinfo, writeText, gcc, pkgs, buildPackages }:
{ lib, pkgs, buildPackages }:
self: let
@@ -32,11 +32,6 @@ self: let
});
};
elpaBuild = import ../build-support/elpa.nix {
inherit lib stdenv texinfo writeText gcc;
inherit (self) emacs;
};
# Use custom elpa url fetcher with fallback/uncompress
fetchurl = buildPackages.callPackage ./fetchelpa.nix { };
@@ -99,6 +94,6 @@ self: let
elpaDevelPackages = super // overrides;
in elpaDevelPackages // { inherit elpaBuild; });
in elpaDevelPackages);
in generateElpa { }
pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix
+2 -7
View File
@@ -22,7 +22,7 @@ formats commits for you.
*/
{ lib, stdenv, texinfo, writeText, gcc, pkgs, buildPackages }:
{ lib, pkgs, buildPackages }:
self: let
@@ -32,11 +32,6 @@ self: let
});
};
elpaBuild = import ../build-support/elpa.nix {
inherit lib stdenv texinfo writeText gcc;
inherit (self) emacs;
};
# Use custom elpa url fetcher with fallback/uncompress
fetchurl = buildPackages.callPackage ./fetchelpa.nix { };
@@ -188,7 +183,7 @@ self: let
elpaPackages = super // overrides;
in elpaPackages // { inherit elpaBuild; });
in elpaPackages);
in
generateElpa { }
pkgs/top-level/emacs-packages.nix
+6 -2
View File
@@ -24,12 +24,12 @@
let
mkElpaDevelPackages = { pkgs, lib }: import ../applications/editors/emacs/elisp-packages/elpa-devel-packages.nix {
inherit (pkgs) stdenv texinfo writeText gcc pkgs buildPackages;
inherit (pkgs) pkgs buildPackages;
inherit lib;
};
mkElpaPackages = { pkgs, lib }: import ../applications/editors/emacs/elisp-packages/elpa-packages.nix {
inherit (pkgs) stdenv texinfo writeText gcc pkgs buildPackages;
inherit (pkgs) pkgs buildPackages;
inherit lib;
};
@@ -81,6 +81,10 @@ in makeScope pkgs'.newScope (self: makeOverridable ({
inherit (self) emacs;
};
elpaBuild = pkgs.callPackage ../applications/editors/emacs/build-support/elpa.nix {
inherit (self) emacs;
};
melpaBuild = pkgs.callPackage ../applications/editors/emacs/build-support/melpa.nix {
inherit (self) emacs;
};