diff options
author | Thomas Tuegel <ttuegel@mailbox.org> | 2018-11-25 15:19:50 -0600 |
---|---|---|
committer | Thomas Tuegel <ttuegel@mailbox.org> | 2018-11-27 09:36:28 -0600 |
commit | fb7749620b5c6c5f432caf80449e98785f580028 (patch) | |
tree | 5201e7d61ed58fb5289b16a3322a8b3c637285ba /pkgs/build-support/emacs/melpa.nix | |
parent | 762295a39cb85147fec1ccf59f721ed59f322665 (diff) | |
download | nixpkgs-fb7749620b5c6c5f432caf80449e98785f580028.tar nixpkgs-fb7749620b5c6c5f432caf80449e98785f580028.tar.gz nixpkgs-fb7749620b5c6c5f432caf80449e98785f580028.tar.bz2 nixpkgs-fb7749620b5c6c5f432caf80449e98785f580028.tar.lz nixpkgs-fb7749620b5c6c5f432caf80449e98785f580028.tar.xz nixpkgs-fb7749620b5c6c5f432caf80449e98785f580028.tar.zst nixpkgs-fb7749620b5c6c5f432caf80449e98785f580028.zip |
melpaBuild: Get package-build from melpa/package-build
This commit causes melpaBuild to use package-build from melpa/package-build instead of melpa/melpa. Development of package-build happens in the former repository whereas the latter is much larger, containing also the MELPA recipes. We do not need to fetch the MELPA recipes from melpa/melpa, as we fetch them one-by-one for Nixpkgs.
Diffstat (limited to 'pkgs/build-support/emacs/melpa.nix')
-rw-r--r-- | pkgs/build-support/emacs/melpa.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/build-support/emacs/melpa.nix b/pkgs/build-support/emacs/melpa.nix index eeb4d19f7ac..96e61bbf90e 100644 --- a/pkgs/build-support/emacs/melpa.nix +++ b/pkgs/build-support/emacs/melpa.nix @@ -35,11 +35,11 @@ import ./generic.nix { inherit lib stdenv emacs texinfo; } ({ then pname else ename; - melpa = fetchFromGitHub { + packageBuild = fetchFromGitHub { owner = "melpa"; - repo = "melpa"; - rev = "7103313a7c31bb1ebb71419e365cd2e279ee4609"; - sha256 = "0m10f83ix0mzjk0vjd4kkb1m1p4b8ha0ll2yjsgk9bqjd7fwapqb"; + repo = "package-build"; + rev = "0a22c3fbbf661822ec1791739953b937a12fa623"; + sha256 = "0dpy5p34il600sc8ic5jdgb3glya9si3lrvhxab0swks8fdydjgs"; }; elpa2nix = ./elpa2nix.el; @@ -51,7 +51,7 @@ import ./generic.nix { inherit lib stdenv emacs texinfo; } ({ cp "$recipe" "$NIX_BUILD_TOP/recipes/$ename" fi - ln -s "$melpa/package-build" "$NIX_BUILD_TOP/package-build" + ln -s "$packageBuild" "$NIX_BUILD_TOP/package-build" mkdir -p "$NIX_BUILD_TOP/packages" ''; @@ -67,7 +67,7 @@ import ./generic.nix { inherit lib stdenv emacs texinfo; } ({ cd "$NIX_BUILD_TOP" emacs --batch -Q \ - -L "$melpa/package-build" \ + -L "$NIX_BUILD_TOP/package-build" \ -l "$melpa2nix" \ -f melpa2nix-build-package \ $ename $version |