summaryrefslogtreecommitdiffstats
path: root/gnu/packages/diffoscope.scm
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2021-12-16 21:10:34 +0100
committerMarius Bakke <marius@gnu.org>2021-12-16 22:21:13 +0100
commit1f4319886a9523ee46033f1d28b15f564bab4312 (patch)
tree6ce8b8849204bef17d8b656892d8bf7066e17ee7 /gnu/packages/diffoscope.scm
parentgnu: file: Add 5.41. (diff)
downloadguix-1f4319886a9523ee46033f1d28b15f564bab4312.tar.gz
guix-1f4319886a9523ee46033f1d28b15f564bab4312.tar.bz2
guix-1f4319886a9523ee46033f1d28b15f564bab4312.tar.xz
gnu: python-magic: Work around crash on .crx files.
* gnu/packages/patches/python-magic-python-bytecode.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/python-xyz.scm (python-magic)[source](patches): Add it. [inputs]: Add FILE-NEXT. [arguments]: While at it, remove input labels. * gnu/packages/diffoscope.scm (diffoscope)[native-inputs]: Add FILE-NEXT.
Diffstat (limited to 'gnu/packages/diffoscope.scm')
-rw-r--r--gnu/packages/diffoscope.scm6
1 files changed, 6 insertions, 0 deletions
diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm
index 696270d506..bfcdf05c9f 100644
--- a/gnu/packages/diffoscope.scm
+++ b/gnu/packages/diffoscope.scm
@@ -34,6 +34,7 @@
34 #:use-module (gnu packages compression) 34 #:use-module (gnu packages compression)
35 #:use-module (gnu packages cpio) 35 #:use-module (gnu packages cpio)
36 #:use-module (gnu packages dbm) 36 #:use-module (gnu packages dbm)
37 #:use-module (gnu packages file) ;for 'file-next'
37 #:use-module (gnu packages gettext) 38 #:use-module (gnu packages gettext)
38 #:use-module (gnu packages ghostscript) 39 #:use-module (gnu packages ghostscript)
39 #:use-module (gnu packages gnome) 40 #:use-module (gnu packages gnome)
@@ -184,6 +185,11 @@
184 ("dtc" ,dtc) 185 ("dtc" ,dtc)
185 ("e2fsprogs" ,e2fsprogs) 186 ("e2fsprogs" ,e2fsprogs)
186 ("ffmpeg" ,ffmpeg) 187 ("ffmpeg" ,ffmpeg)
188
189 ;; XXX: Must be the same version as python-magic uses;
190 ;; remove when 'file' is updated.
191 ("file" ,file-next)
192
187 ("fpc" ,fpc) 193 ("fpc" ,fpc)
188 ("gettext" ,gettext-minimal) 194 ("gettext" ,gettext-minimal)
189 ("ghostscript" ,ghostscript) 195 ("ghostscript" ,ghostscript)