diff options
author | Benjamin Hipple <bhipple@protonmail.com> | 2020-02-15 18:41:54 -0500 |
---|---|---|
committer | Jon <jonringer@users.noreply.github.com> | 2020-02-16 09:36:17 -0800 |
commit | 201d464f1207961f535f3b70fb305dd016dcd882 (patch) | |
tree | e7e17f379629020b10c693e652e8d9f3b87c0747 /pkgs/applications/version-management/pijul | |
parent | 2494471a140ff025359272cac4bc4105ed0a8071 (diff) |
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
Diffstat (limited to 'pkgs/applications/version-management/pijul')
-rw-r--r-- | pkgs/applications/version-management/pijul/default.nix | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index c2df8c971b0e4..c6c0f0a52f4b2 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -20,8 +20,18 @@ in rustPlatform.buildRustPackage rec { sha256 = "1rm787kkh3ya8ix0rjvj7sbrg9armm0rnpkga6gjmsbg5bx20y4q"; }; + cargoSha256 = "0rf8qmgzgyl718yznbskzafyg963ygibjmqncd93zdandgl9nj5v"; + + # N.B. The cargo depfile checker expects us to have unpacked the src tarball + # into the standard dirname "source". + cargoDepsHook = '' + ln -s ${pname}-${version} source + ''; + + # TODO: Delete once pijul fixes upstream: + # https://nest.pijul.com/pijul_org/pijul/discussions/447 postPatch = '' - pushd ../${pname}-${version}-vendor/thrussh/ + pushd ../${pname}-${version}-vendor.tar.gz/thrussh/ patch -p1 < ${./thrussh-build-fix.patch} substituteInPlace .cargo-checksum.json --replace \ 9696ed2422a483cd8de48ac241178a0441be6636909c76174c536b8b1cba9d45 \ @@ -45,11 +55,6 @@ in rustPlatform.buildRustPackage rec { doCheck = false; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1w77s5q18yr1gqqif15wmrfdvv2chq8rq3w4dnmxg2gn0r7bmz2k"; - meta = with stdenv.lib; { description = "A distributed version control system"; homepage = https://pijul.org; |