From 18d1c014bfa4c92d20c0a2dd8ff47c0f2cddbb06 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 9 Feb 2023 10:33:18 +0000 Subject: [PATCH 1/2] file: fix identification of pyzip files --- pkgs/tools/misc/file/default.nix | 7 +++++++ pkgs/tools/misc/file/pyzip.patch | 36 ++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 pkgs/tools/misc/file/pyzip.patch diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index 806d1bc24bdc..2edba63c1723 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -17,6 +17,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-N1HH+6jbyDHLjXzIr/IQNUWbjOUVXviwiAon0ChHXzs="; }; + patches = [ + # Backport fix to identification for pyzip files. + # Needed for strip-nondeterminism. + # https://salsa.debian.org/reproducible-builds/strip-nondeterminism/-/issues/20 + ./pyzip.patch + ]; + strictDeps = true; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/file/pyzip.patch b/pkgs/tools/misc/file/pyzip.patch new file mode 100644 index 000000000000..57f9e7ef8b64 --- /dev/null +++ b/pkgs/tools/misc/file/pyzip.patch @@ -0,0 +1,36 @@ +From dc71304b3b1fd2ed5f7098d59fb7f6ef10cfdc85 Mon Sep 17 00:00:00 2001 +From: Christos Zoulas +Date: Sat, 31 Dec 2022 20:24:08 +0000 +Subject: [PATCH] pyzip improvements (FC Stegerman) + +--- + magic/Magdir/archive | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/magic/Magdir/archive b/magic/Magdir/archive +index a706556d5..d58201e69 100644 +--- a/magic/Magdir/archive ++++ b/magic/Magdir/archive +@@ -1,5 +1,5 @@ + #------------------------------------------------------------------------------ +-# $File: archive,v 1.179 2022/12/21 15:50:59 christos Exp $ ++# $File: archive,v 1.180 2022/12/31 20:24:08 christos Exp $ + # archive: file(1) magic for archive formats (see also "msdos" for self- + # extracting compressed archives) + # +@@ -1876,9 +1876,14 @@ + # https://en.wikipedia.org/wiki/ZIP_(file_format)#End_of_central_directory_record_(EOCD) + # by Michal Gorny + -2 uleshort 0 +->&-22 string PK\005\006 Zip archive, with extra data prepended ++>&-22 string PK\005\006 ++# without #! ++>>0 string !#! Zip archive, with extra data prepended + !:mime application/zip + !:ext zip/cbz ++# with #! ++>>0 string/w #!\ a ++>>>&-1 string/T x %s script executable (Zip archive) + + # ACE archive (from http://www.wotsit.org/download.asp?f=ace) + # by Stefan `Sec` Zehl From 92e6b205ed8b823e2d832cde5928239c4466e7f7 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 9 Feb 2023 10:33:43 +0000 Subject: [PATCH 2/2] strip-nondeterminism: 1.13.0 -> 1.13.1 Fixes build. --- .../development/perl-modules/strip-nondeterminism/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/perl-modules/strip-nondeterminism/default.nix b/pkgs/development/perl-modules/strip-nondeterminism/default.nix index d33362d4a170..806ad65b737b 100644 --- a/pkgs/development/perl-modules/strip-nondeterminism/default.nix +++ b/pkgs/development/perl-modules/strip-nondeterminism/default.nix @@ -11,7 +11,7 @@ buildPerlPackage rec { pname = "strip-nondeterminism"; - version = "1.13.0"; + version = "1.13.1"; outputs = [ "out" "dev" ]; # no "devdoc" @@ -20,7 +20,7 @@ buildPerlPackage rec { repo = "strip-nondeterminism"; domain = "salsa.debian.org"; rev = version; - sha256 = "sha256-KZQeoJYBPJzUvz4wlUZbiGODbpCp7/52dsg5OemKDkI="; + sha256 = "czx9UhdgTsQSfDNo1mMOXCM/3/nuNe+cPZeyy2xdnKs="; }; strictDeps = true;