nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-04-13 15:07:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #215488 from alyssais/strip-nondeterminism-1.13.1

Browse Source 
strip-nondeterminism: fix build
This commit is contained in:
Artturi 2023-02-09 17:21:53 +02:00 committed by GitHub
commit 56c4f27b18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 45 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/perl-modules/strip-nondeterminism/default.nix
View File

@ -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;

7
pkgs/tools/misc/file/default.nix
View File

@ -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;

36
pkgs/tools/misc/file/pyzip.patch Normal file
View File

@ -0,0 +1,36 @@
From dc71304b3b1fd2ed5f7098d59fb7f6ef10cfdc85 Mon Sep 17 00:00:00 2001
From: Christos Zoulas <christos@zoulas.com>
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 <mgorny@gentoo.org>
-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 <sec@42.org>