git.iko.soy/typeable/nixpkgs
on master help sign in
pijul: fix build by migrating off legacy fetchCargo

Currently broken; see #79975 for details. Would also be fixed by #80153 eventually, but since we want to upgrade either way we might as well do so now. https://hydra.nixos.org/job/nixpkgs/trunk/pijul.x86_64-linux

commit201d464f1207961f535f3b70fb305dd016dcd882 authorBenjamin Hipple <bhipple@protonmail.com> dateSat 15 Feb 2020, 18:41 (7 years ago) parent2494471
1 file changed+11−6
pkgs/applications/version-management/pijul/default.nix+11−6
pkgs/applications/version-management/pijul/default.nix+11−6
@@ -20,8 +20,18 @@ in rustPlatform.buildRustPackage rec {
2020 sha256 = "1rm787kkh3ya8ix0rjvj7sbrg9armm0rnpkga6gjmsbg5bx20y4q";
2121 };
2222
23+ cargoSha256 = "0rf8qmgzgyl718yznbskzafyg963ygibjmqncd93zdandgl9nj5v";
24+
25+ # N.B. The cargo depfile checker expects us to have unpacked the src tarball
26+ # into the standard dirname "source".
27+ cargoDepsHook = ''
28+ ln -s ${pname}-${version} source
29+ '';
30+
31+ # TODO: Delete once pijul fixes upstream:
32+ # https://nest.pijul.com/pijul_org/pijul/discussions/447
2333 postPatch = ''
24− pushd ../${pname}-${version}-vendor/thrussh/
34+ pushd ../${pname}-${version}-vendor.tar.gz/thrussh/
2535 patch -p1 < ${./thrussh-build-fix.patch}
2636 substituteInPlace .cargo-checksum.json --replace \
2737 9696ed2422a483cd8de48ac241178a0441be6636909c76174c536b8b1cba9d45 \
@@ -45,11 +55,6 @@ in rustPlatform.buildRustPackage rec {
4555
4656 doCheck = false;
4757
48− # Delete this on next update; see #79975 for details
49− legacyCargoFetcher = true;
50−
51− cargoSha256 = "1w77s5q18yr1gqqif15wmrfdvv2chq8rq3w4dnmxg2gn0r7bmz2k";
52−
5358 meta = with stdenv.lib; {
5459 description = "A distributed version control system";
5560 homepage = https://pijul.org;