summary refs log tree commit diff
path: root/pkgs/build-support/emacs/melpa.nix
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2021-07-06 15:52:13 +0000
committerAlyssa Ross <hi@alyssa.is>2021-07-06 16:07:13 +0000
commit9140d4b06ff09bce8dd8e384eeef832e7811d288 (patch)
treebc2754cbe85f568b931be350b2f9fa317583f53f /pkgs/build-support/emacs/melpa.nix
parent302d7c656544e35d0e53edbf40197d895428109d (diff)
downloadnixpkgs-9140d4b06ff09bce8dd8e384eeef832e7811d288.tar
nixpkgs-9140d4b06ff09bce8dd8e384eeef832e7811d288.tar.gz
nixpkgs-9140d4b06ff09bce8dd8e384eeef832e7811d288.tar.bz2
nixpkgs-9140d4b06ff09bce8dd8e384eeef832e7811d288.tar.lz
nixpkgs-9140d4b06ff09bce8dd8e384eeef832e7811d288.tar.xz
nixpkgs-9140d4b06ff09bce8dd8e384eeef832e7811d288.tar.zst
nixpkgs-9140d4b06ff09bce8dd8e384eeef832e7811d288.zip
emacs.pkgs.melpaBuild: package-build: 2018-10-05 -> 2021-04-13
I think this is due an update.  I've chosen to update to the latest
version that has been merged into Melpa.

Unfortunately we now need to hack around it trying to run VCS
commands.

My Emacs configuration with thirty-something leaf packages seems fine
after the rebuild.
Diffstat (limited to 'pkgs/build-support/emacs/melpa.nix')
-rw-r--r--pkgs/build-support/emacs/melpa.nix6
1 files changed, 3 insertions, 3 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
     '';