summaryrefslogtreecommitdiffstats
path: root/gnu/packages/diffoscope.scm
diff options
context:
space:
mode:
authorVagrant Cascadian <vagrant@reproducible-builds.org>2021-10-27 08:58:22 -0700
committerVagrant Cascadian <vagrant@debian.org>2021-10-27 08:58:42 -0700
commitaf4ce7bd413c3a50733bfcc05370903a1e3808bc (patch)
treedf01591036c0469a28b0e7ac603fe0fb59634ff3 /gnu/packages/diffoscope.scm
parentnews: Add 'de' translation. (diff)
downloadguix-af4ce7bd413c3a50733bfcc05370903a1e3808bc.tar.gz
guix-af4ce7bd413c3a50733bfcc05370903a1e3808bc.tar.bz2
guix-af4ce7bd413c3a50733bfcc05370903a1e3808bc.tar.xz
gnu: diffoscope: Update to 188.
* gnu/packages/patches/diffoscope-fix-test_item3_deflate_llvm_bitcode.patch: Rename patch to... * gnu/packages/patches/diffoscope-fix-llvm-test.patch: This. * gnu/local.mk (dist_patch_DATA): Update patch name. * gnu/packages/diffoscope.scm (diffoscope): Update to 188. [source]: Update patch name. [arguments]: Add skip-python-tests phase. Add fpc-external-tool phase. Add use-dumppdf-py phase. [native-inputs]: Add fpc.
Diffstat (limited to 'gnu/packages/diffoscope.scm')
-rw-r--r--gnu/packages/diffoscope.scm38
1 files changed, 35 insertions, 3 deletions
diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm
index f96577ce6d..cb4c766f4e 100644
--- a/gnu/packages/diffoscope.scm
+++ b/gnu/packages/diffoscope.scm
@@ -49,6 +49,7 @@
49 #:use-module (gnu packages mono) 49 #:use-module (gnu packages mono)
50 #:use-module (gnu packages ocaml) 50 #:use-module (gnu packages ocaml)
51 #:use-module (gnu packages package-management) 51 #:use-module (gnu packages package-management)
52 #:use-module (gnu packages pascal)
52 #:use-module (gnu packages patchutils) 53 #:use-module (gnu packages patchutils)
53 #:use-module (gnu packages pdf) 54 #:use-module (gnu packages pdf)
54 #:use-module (gnu packages python-web) 55 #:use-module (gnu packages python-web)
@@ -72,7 +73,7 @@
72(define-public diffoscope 73(define-public diffoscope
73 (package 74 (package
74 (name "diffoscope") 75 (name "diffoscope")
75 (version "186") 76 (version "188")
76 (source 77 (source
77 (origin 78 (origin
78 (method git-fetch) 79 (method git-fetch)
@@ -81,9 +82,9 @@
81 (commit version))) 82 (commit version)))
82 (file-name (git-file-name name version)) 83 (file-name (git-file-name name version))
83 (sha256 84 (sha256
84 (base32 "1qlll5jn76ci5jy915v2kvyngfyycwylxpbdylffzaninvdy3dav")) 85 (base32 "1byd28ihni5g0ikjjcsq68smj1rw33vv9z0cymqa4ds670c77yvn"))
85 (patches 86 (patches
86 (search-patches "diffoscope-fix-test_item3_deflate_llvm_bitcode.patch")))) 87 (search-patches "diffoscope-fix-llvm-test.patch"))))
87 (build-system python-build-system) 88 (build-system python-build-system)
88 (arguments 89 (arguments
89 `(#:phases (modify-phases %standard-phases 90 `(#:phases (modify-phases %standard-phases
@@ -108,6 +109,36 @@
108 (string-append "['" (which "stat") "',")) 109 (string-append "['" (which "stat") "',"))
109 (("\\['getfacl',") 110 (("\\['getfacl',")
110 (string-append "['" (which "getfacl") "',"))))) 111 (string-append "['" (which "getfacl") "',")))))
112 (add-after 'unpack 'skip-python-tests
113 (lambda _
114 ;; Python tests appear to assume python 3.9, remove
115 ;; phase when python is upgraded
116 (substitute* "tests/comparators/test_python.py"
117 (("def test_identification")
118 "def skip_test_identification"))
119 (substitute* "tests/comparators/test_python.py"
120 (("def test_diff")
121 "def skip_test_diff"))))
122 (add-after 'unpack 'use-dumppdf-py
123 ;; python-pdfminer-six ships "dumppdf" as "dumppdf.py"
124 ;; https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/283
125 ;; Fixed upstream, remove this phase when updating to
126 ;; diffoscope 189
127 (lambda _
128 (substitute* "diffoscope/comparators/pdf.py"
129 (("dumppdf") "dumppdf.py"))
130 (substitute* "diffoscope/external_tools.py"
131 (("dumppdf") "dumppdf.py"))
132 (substitute* "diffoscope/external_tools.py"
133 (("'debian': 'python3-pdfminer'")
134 "'debian': 'python3-pdfminer', 'guix': 'python-pdfminer-six'"))))
135 (add-after 'unpack 'fpc-external-tool
136 ;; Fixed upstream, remove this phase when updating to
137 ;; diffoscope 189
138 (lambda _
139 (substitute* "diffoscope/external_tools.py"
140 (("'debian': 'fp-utils'")
141 "'debian': 'fp-utils', 'guix': 'fpc'"))))
111 (add-after 'build 'build-man-page 142 (add-after 'build 'build-man-page
112 (lambda* (#:key (make-flags '()) #:allow-other-keys) 143 (lambda* (#:key (make-flags '()) #:allow-other-keys)
113 (apply invoke "make" "-C" "doc" make-flags))) 144 (apply invoke "make" "-C" "doc" make-flags)))
@@ -182,6 +213,7 @@
182 ("dtc" ,dtc) 213 ("dtc" ,dtc)
183 ("e2fsprogs" ,e2fsprogs) 214 ("e2fsprogs" ,e2fsprogs)
184 ("ffmpeg" ,ffmpeg) 215 ("ffmpeg" ,ffmpeg)
216 ("fpc" ,fpc)
185 ("gettext" ,gettext-minimal) 217 ("gettext" ,gettext-minimal)
186 ("ghostscript" ,ghostscript) 218 ("ghostscript" ,ghostscript)
187 ("giflib:bin" ,giflib "bin") 219 ("giflib:bin" ,giflib "bin")