diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2024-01-31 07:29:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-31 07:29:36 -0500 |
| commit | 50adc5a275dee57e8b3599c0b2f325e7eb009321 (patch) | |
| tree | d43eae0687ba9be244d4afd45d90d2a798337265 /pkgs/tools | |
| parent | f318aa45df24db760428c30654feed407f5e3901 (diff) | |
| parent | 32cacb910002b59442fdd10bf5a5de3d8e326071 (diff) | |
| download | nixlib-50adc5a275dee57e8b3599c0b2f325e7eb009321.tar nixlib-50adc5a275dee57e8b3599c0b2f325e7eb009321.tar.gz nixlib-50adc5a275dee57e8b3599c0b2f325e7eb009321.tar.bz2 nixlib-50adc5a275dee57e8b3599c0b2f325e7eb009321.tar.lz nixlib-50adc5a275dee57e8b3599c0b2f325e7eb009321.tar.xz nixlib-50adc5a275dee57e8b3599c0b2f325e7eb009321.tar.zst nixlib-50adc5a275dee57e8b3599c0b2f325e7eb009321.zip | |
Merge pull request #281226 from trofi/cpio-update
cpio: 2.14 -> 2.15
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/archivers/cpio/default.nix | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/pkgs/tools/archivers/cpio/default.nix b/pkgs/tools/archivers/cpio/default.nix index 4116a0b3e4ca..5b65a580fa67 100644 --- a/pkgs/tools/archivers/cpio/default.nix +++ b/pkgs/tools/archivers/cpio/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , autoreconfHook # for passthru.tests @@ -13,22 +12,13 @@ stdenv.mkDerivation rec { pname = "cpio"; - version = "2.14"; + version = "2.15"; src = fetchurl { url = "mirror://gnu/cpio/cpio-${version}.tar.bz2"; - sha256 = "/NwV1g9yZ6b8fvzWudt7bIlmxPL7u5ZMJNQTNv0/LBI="; + hash = "sha256-k3YQuXwymh7JJoVT+3gAN7z/8Nz/6XJevE/ZwaqQdds="; }; - patches = [ - # Pull upstream fix for clang-16 and gcc-14. - (fetchpatch { - name = "major-decl.patch"; - url = "https://git.savannah.gnu.org/cgit/cpio.git/patch/?id=8179be21e664cedb2e9d238cc2f6d04965e97275"; - hash = "sha256-k5Xiv3xuPU8kPT6D9B6p+V8SK55ybFgrIIPDgHuorpM="; - }) - ]; - nativeBuildInputs = [ autoreconfHook ]; separateDebugInfo = true; |