file: add patches (#517316)

This commit is contained in:
Michael Daniels
2026-05-07 02:28:24 +00:00
committed by GitHub
4 changed files with 51 additions and 0 deletions
@@ -38,6 +38,9 @@ buildPythonPackage rec {
url = "https://github.com/ahupp/python-magic/commit/3d2405ca80cd39b2a91decd26af81dcf181390a4.patch";
hash = "sha256-HRsnO9MGfMD9BkJdC4SrEFQ1OZEaXpwakXFLoaCPK94=";
})
# Fix test failures due to modified output in file 5.47
./fix-parquet-test.patch
];
preCheck = ''
@@ -0,0 +1,20 @@
--- a/test/python_magic_test.py
+++ b/test/python_magic_test.py
@@ -93,7 +93,7 @@ class MagicTest(unittest.TestCase):
'magic._pyc_': ('application/octet-stream', 'text/x-bytecode.python', 'application/x-bytecode.python'),
'test.pdf': 'application/pdf',
'test.gz': ('application/gzip', 'application/x-gzip'),
- 'test.snappy.parquet': 'application/octet-stream',
+ 'test.snappy.parquet': ('application/octet-stream', 'application/vnd.apache.parquet'),
'text.txt': 'text/plain',
b'\xce\xbb'.decode('utf-8'): 'text/plain',
b'\xce\xbb': 'text/plain',
@@ -123,7 +123,7 @@ class MagicTest(unittest.TestCase):
': Sun Jun 29 01:32:52 2008, from Unix, truncated'
),
'text.txt': 'ASCII text',
- 'test.snappy.parquet': ('Apache Parquet', 'Par archive data'),
+ 'test.snappy.parquet': ('Apache Parquet', 'Apache Parquet file', 'Par archive data'),
}, buf_equals_file=False)
finally:
del os.environ['TZ']
@@ -0,0 +1,26 @@
From c54605718190ad8fe9c25cb475f1f32ca7cd54f7 Mon Sep 17 00:00:00 2001
From: Christos Zoulas <christos@zoulas.com>
Date: Sun, 12 Apr 2026 22:15:14 +0000
Subject: [PATCH] PR/725: inliniac: Revert previous and always set offset.
---
src/softmagic.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/softmagic.c b/src/softmagic.c
index 9aaf8b3e..7cf7c798 100644
--- a/src/softmagic.c
+++ b/src/softmagic.c
@@ -1577,8 +1577,7 @@ normal:
ms->offset = offset;
ms->eoffset = 0;
} else {
- if (b->fd != -1)
- ms->offset = ms->eoffset + offset;
+ ms->offset = ms->eoffset + offset;
}
}
if ((ms->flags & MAGIC_DEBUG) != 0) {
--
2.51.2
+2
View File
@@ -39,6 +39,8 @@ stdenv.mkDerivation (finalAttrs: {
# Vendored patch because using fetchpatch is impossible for a package in
# this part of the bootstrap chain.
./0001-PR-745-streamout-Don-t-flush-when-trying-to-set-nega.patch
# Fixes breakage of python3Packages.python-magic and xdg-utils
./0002-PR-725-inliniac-Revert-previous-and-always-set-offse.patch
];
strictDeps = true;