diff options
| author | adisbladis <adisbladis@gmail.com> | 2021-07-14 13:32:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-14 13:32:51 -0500 |
| commit | 0a908ddaccbdada9a985f27d1e48a059454966cc (patch) | |
| tree | 1cdc3b8eb07adbaa1ea38637006158c6eba4d2bb /pkgs/build-support | |
| parent | d75b67bfa4bb2dd7abad55a79426788ba2628f9f (diff) | |
| parent | 9140d4b06ff09bce8dd8e384eeef832e7811d288 (diff) | |
| download | nixpkgs-0a908ddaccbdada9a985f27d1e48a059454966cc.tar nixpkgs-0a908ddaccbdada9a985f27d1e48a059454966cc.tar.gz nixpkgs-0a908ddaccbdada9a985f27d1e48a059454966cc.tar.bz2 nixpkgs-0a908ddaccbdada9a985f27d1e48a059454966cc.tar.lz nixpkgs-0a908ddaccbdada9a985f27d1e48a059454966cc.tar.xz nixpkgs-0a908ddaccbdada9a985f27d1e48a059454966cc.tar.zst nixpkgs-0a908ddaccbdada9a985f27d1e48a059454966cc.zip | |
Merge pull request #129458 from alyssais/package-build
emacs.pkgs.melpaBuild: package-build: 2018-10-05 -> 2021-04-13
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/emacs/melpa.nix | 6 | ||||
| -rw-r--r-- | pkgs/build-support/emacs/melpa2nix.el | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/build-support/emacs/melpa.nix b/pkgs/build-support/emacs/melpa.nix index 824611b20c8..c30d3e59906 100644 --- a/pkgs/build-support/emacs/melpa.nix +++ b/pkgs/build-support/emacs/melpa.nix @@ -38,8 +38,8 @@ import ./generic.nix { inherit lib stdenv emacs texinfo writeText; } ({ packageBuild = fetchFromGitHub { owner = "melpa"; repo = "package-build"; - rev = "0a22c3fbbf661822ec1791739953b937a12fa623"; - sha256 = "0dpy5p34il600sc8ic5jdgb3glya9si3lrvhxab0swks8fdydjgs"; + rev = "047801d301a73d4932f33f768d94a8ed26b8d524"; + sha256 = "0ygzkpg7xc3mjjbxg1kcyz6fwbkb0prvca499f0ffmhfaiv28h59"; }; elpa2nix = ./elpa2nix.el; @@ -70,7 +70,7 @@ import ./generic.nix { inherit lib stdenv emacs texinfo writeText; } ({ -L "$NIX_BUILD_TOP/package-build" \ -l "$melpa2nix" \ -f melpa2nix-build-package \ - $ename $version + $ename $version $commit runHook postBuild ''; diff --git a/pkgs/build-support/emacs/melpa2nix.el b/pkgs/build-support/emacs/melpa2nix.el index 99c755e2afc..bd2aadd5aeb 100644 --- a/pkgs/build-support/emacs/melpa2nix.el +++ b/pkgs/build-support/emacs/melpa2nix.el @@ -12,5 +12,8 @@ (if (not noninteractive) (error "`melpa2nix-build-package' is to be used only with -batch")) (pcase command-line-args-left - (`(,package ,version) + (`(,package ,version ,commit) + ;; Monkey-patch package-build so it doesn't shell out to git/hg. + (defun package-build--get-commit (&rest _) + commit) (package-build--package (package-recipe-lookup package) version)))) |