git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #129458 from alyssais/package-build

emacs.pkgs.melpaBuild: package-build: 2018-10-05 -> 2021-04-13

commit0a908ddaccbdada9a985f27d1e48a059454966cc authoradisbladis <adisbladis@gmail.com> dateWed 14 Jul 2021, 13:32 (5 years ago) parentd75b67b9140d4b
3 files changed+8−6
compare with master
unifiedsplit
pkgs/applications/editors/emacs/elisp-packages/libgenerated.nix+1−2 pkgs/build-support/emacs/melpa.nix+3−3 pkgs/build-support/emacs/melpa2nix.el+4−1
pkgs/applications/editors/emacs/elisp-packages/libgenerated.nix+1−2
@@ -67,8 +67,7 @@ in {
6767 lib.nameValuePair ename (
6868 self.callPackage ({ melpaBuild, fetchurl, ... }@pkgargs:
6969 melpaBuild {
70− inherit pname;
71− ename = ename;
70+ inherit pname ename commit;
7271 version = if isNull version then "" else
7372 lib.concatStringsSep "." (map toString version);
7473 # TODO: Broken should not result in src being null (hack to avoid eval errors)
pkgs/build-support/emacs/melpa.nix+3−3
@@ -38,8 +38,8 @@ import ./generic.nix { inherit lib stdenv emacs texinfo writeText; } ({
3838 packageBuild = fetchFromGitHub {
3939 owner = "melpa";
4040 repo = "package-build";
41− rev = "0a22c3fbbf661822ec1791739953b937a12fa623";
42− sha256 = "0dpy5p34il600sc8ic5jdgb3glya9si3lrvhxab0swks8fdydjgs";
41+ rev = "047801d301a73d4932f33f768d94a8ed26b8d524";
42+ sha256 = "0ygzkpg7xc3mjjbxg1kcyz6fwbkb0prvca499f0ffmhfaiv28h59";
4343 };
4444
4545 elpa2nix = ./elpa2nix.el;
@@ -70,7 +70,7 @@ import ./generic.nix { inherit lib stdenv emacs texinfo writeText; } ({
7070 -L "$NIX_BUILD_TOP/package-build" \
7171 -l "$melpa2nix" \
7272 -f melpa2nix-build-package \
73− $ename $version
73+ $ename $version $commit
7474
7575 runHook postBuild
7676 '';
pkgs/build-support/emacs/melpa2nix.el+4−1
@@ -12,5 +12,8 @@
1212 (if (not noninteractive)
1313 (error "`melpa2nix-build-package' is to be used only with -batch"))
1414 (pcase command-line-args-left
15− (`(,package ,version)
15+ (`(,package ,version ,commit)
16+ ;; Monkey-patch package-build so it doesn't shell out to git/hg.
17+ (defun package-build--get-commit (&rest _)
18+ commit)
1619 (package-build--package (package-recipe-lookup package) version))))