diff options
author | Artturin <Artturin@artturin.com> | 2022-07-20 22:47:14 +0300 |
---|---|---|
committer | Artturin <Artturin@artturin.com> | 2022-07-20 22:47:14 +0300 |
commit | 41877098f3ac00295a2a9d5e5846201b969a689b (patch) | |
tree | c89e610ec60c668d05cfd8f1a4b9b81814610406 /pkgs/build-support/fetchpatch | |
parent | b9da0d3852fc0069cb555f8679901ba075ee3f90 (diff) |
fetchpatch2: init
allows us to use the new features of patchutils without having to reset all fetchpatch hashes in nixpkgs https://github.com/NixOS/nixpkgs/issues/32084
Diffstat (limited to 'pkgs/build-support/fetchpatch')
-rw-r--r-- | pkgs/build-support/fetchpatch/default.nix | 7 | ||||
-rw-r--r-- | pkgs/build-support/fetchpatch/tests.nix | 10 |
2 files changed, 9 insertions, 8 deletions
diff --git a/pkgs/build-support/fetchpatch/default.nix b/pkgs/build-support/fetchpatch/default.nix index d46162c97ff4e..3ebe797f736da 100644 --- a/pkgs/build-support/fetchpatch/default.nix +++ b/pkgs/build-support/fetchpatch/default.nix @@ -4,11 +4,8 @@ # often change with updating of git or cgit. # stripLen acts as the -p parameter when applying a patch. -{ lib, fetchurl, buildPackages }: -let - # 0.3.4 would change hashes: https://github.com/NixOS/nixpkgs/issues/25154 - patchutils = buildPackages.patchutils_0_3_3; -in +{ lib, fetchurl, patchutils }: + { relative ? null , stripLen ? 0 , extraPrefix ? null diff --git a/pkgs/build-support/fetchpatch/tests.nix b/pkgs/build-support/fetchpatch/tests.nix index a42b7cd7d14b3..38bbb8ba69d28 100644 --- a/pkgs/build-support/fetchpatch/tests.nix +++ b/pkgs/build-support/fetchpatch/tests.nix @@ -1,15 +1,19 @@ { testers, fetchpatch, ... }: +let + isFetchpatch2 = fetchpatch.version == 2; +in + { simple = testers.invalidateFetcherByDrvHash fetchpatch { url = "https://github.com/facebook/zstd/pull/2724/commits/e1f85dbca3a0ed5ef06c8396912a0914db8dea6a.patch"; - sha256 = "sha256-PuYAqnJWAE+L9bsroOnnBGJhERW8LHrGSLtIEkKU9vg="; + sha256 = if isFetchpatch2 then "sha256-01BrkHLye4KOdqCw3tv7AJzIF6578pl2fl270TJFTmw=" else "sha256-PuYAqnJWAE+L9bsroOnnBGJhERW8LHrGSLtIEkKU9vg="; }; relative = testers.invalidateFetcherByDrvHash fetchpatch { url = "https://github.com/boostorg/math/commit/7d482f6ebc356e6ec455ccb5f51a23971bf6ce5b.patch"; relative = "include"; - sha256 = "sha256-KlmIbixcds6GyKYt1fx5BxDIrU7msrgDdYo9Va/KJR4="; + sha256 = if isFetchpatch2 then "sha256-1TtmuKeNIl/Yp+sfzBMR8Ue78tPIgjqGgjasa5IN52o=" else "sha256-KlmIbixcds6GyKYt1fx5BxDIrU7msrgDdYo9Va/KJR4="; }; full = testers.invalidateFetcherByDrvHash fetchpatch { @@ -19,6 +23,6 @@ extraPrefix = "foo/bar/"; excludes = [ "foo/bar/bernoulli_no_atomic_mp.cpp" ]; revert = true; - sha256 = "sha256-+UKmEbr2rIAweCav/hR/7d4ZrYV84ht/domTrHtm8sM="; + sha256 = if isFetchpatch2 then "sha256-+UKmEbr2rIAweCav/hR/7d4ZrYV84ht/domTrHtm8sM=" else "sha256-+UKmEbr2rIAweCav/hR/7d4ZrYV84ht/domTrHtm8sM="; }; } |