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 | |
parent | b9da0d3852fc0069cb555f8679901ba075ee3f90 (diff) | |
download | nixpkgs-41877098f3ac00295a2a9d5e5846201b969a689b.tar nixpkgs-41877098f3ac00295a2a9d5e5846201b969a689b.tar.gz nixpkgs-41877098f3ac00295a2a9d5e5846201b969a689b.tar.bz2 nixpkgs-41877098f3ac00295a2a9d5e5846201b969a689b.tar.lz nixpkgs-41877098f3ac00295a2a9d5e5846201b969a689b.tar.xz nixpkgs-41877098f3ac00295a2a9d5e5846201b969a689b.tar.zst nixpkgs-41877098f3ac00295a2a9d5e5846201b969a689b.zip |
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
-rw-r--r-- | pkgs/build-support/fetchpatch/default.nix | 7 | ||||
-rw-r--r-- | pkgs/build-support/fetchpatch/tests.nix | 10 | ||||
-rw-r--r-- | pkgs/test/default.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 18 |
4 files changed, 24 insertions, 12 deletions
diff --git a/pkgs/build-support/fetchpatch/default.nix b/pkgs/build-support/fetchpatch/default.nix index d46162c97ff..3ebe797f736 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 a42b7cd7d14..38bbb8ba69d 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="; }; } diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 82975efb591..ae98bac4f5f 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -31,6 +31,7 @@ with pkgs; fetchurl = callPackages ../build-support/fetchurl/tests.nix { }; fetchpatch = callPackages ../build-support/fetchpatch/tests.nix { }; + fetchpatch2 = callPackages ../build-support/fetchpatch/tests.nix { fetchpatch = fetchpatch2; }; fetchzip = callPackages ../build-support/fetchzip/tests.nix { }; fetchgit = callPackages ../build-support/fetchgit/tests.nix { }; fetchFirefoxAddon = callPackages ../build-support/fetchfirefoxaddon/tests.nix { }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4221ad13281..b3ec8e5f019 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -691,10 +691,20 @@ with pkgs; broadlink-cli = callPackage ../tools/misc/broadlink-cli {}; - fetchpatch = callPackage ../build-support/fetchpatch { } - // { - tests = pkgs.tests.fetchpatch; - }; + fetchpatch = callPackage ../build-support/fetchpatch { + # 0.3.4 would change hashes: https://github.com/NixOS/nixpkgs/issues/25154 + patchutils = buildPackages.patchutils_0_3_3; + } // { + tests = pkgs.tests.fetchpatch; + version = 1; + }; + + fetchpatch2 = callPackage ../build-support/fetchpatch { + patchutils = buildPackages.patchutils_0_4_2; + } // { + tests = pkgs.tests.fetchpatch2; + version = 2; + }; fetchs3 = callPackage ../build-support/fetchs3 { }; |