[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: gnu: diffoscope: Update to 188.
From: |
guix-commits |
Subject: |
branch master updated: gnu: diffoscope: Update to 188. |
Date: |
Wed, 27 Oct 2021 12:02:59 -0400 |
This is an automated email from the git hooks/post-receive script.
vagrantc pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new af4ce7b gnu: diffoscope: Update to 188.
af4ce7b is described below
commit af4ce7bd413c3a50733bfcc05370903a1e3808bc
Author: Vagrant Cascadian <vagrant@reproducible-builds.org>
AuthorDate: Wed Oct 27 08:58:22 2021 -0700
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.
---
gnu/local.mk | 2 +-
gnu/packages/diffoscope.scm | 38 ++++++++++++++++++++--
...itcode.patch => diffoscope-fix-llvm-test.patch} | 0
3 files changed, 36 insertions(+), 4 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 28e8c19..0c3f212 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -996,7 +996,7 @@ dist_patch_DATA =
\
%D%/packages/patches/desmume-gcc6-fixes.patch \
%D%/packages/patches/desmume-gcc7-fixes.patch \
%D%/packages/patches/dfu-programmer-fix-libusb.patch \
- %D%/packages/patches/diffoscope-fix-test_item3_deflate_llvm_bitcode.patch
\
+ %D%/packages/patches/diffoscope-fix-llvm-test.patch \
%D%/packages/patches/diffutils-gets-undeclared.patch \
%D%/packages/patches/dkimproxy-add-ipv6-support.patch \
%D%/packages/patches/docbook-xsl-nonrecursive-string-subst.patch \
diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm
index f96577c..cb4c766 100644
--- a/gnu/packages/diffoscope.scm
+++ b/gnu/packages/diffoscope.scm
@@ -49,6 +49,7 @@
#:use-module (gnu packages mono)
#:use-module (gnu packages ocaml)
#:use-module (gnu packages package-management)
+ #:use-module (gnu packages pascal)
#:use-module (gnu packages patchutils)
#:use-module (gnu packages pdf)
#:use-module (gnu packages python-web)
@@ -72,7 +73,7 @@
(define-public diffoscope
(package
(name "diffoscope")
- (version "186")
+ (version "188")
(source
(origin
(method git-fetch)
@@ -81,9 +82,9 @@
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "1qlll5jn76ci5jy915v2kvyngfyycwylxpbdylffzaninvdy3dav"))
+ (base32 "1byd28ihni5g0ikjjcsq68smj1rw33vv9z0cymqa4ds670c77yvn"))
(patches
- (search-patches
"diffoscope-fix-test_item3_deflate_llvm_bitcode.patch"))))
+ (search-patches "diffoscope-fix-llvm-test.patch"))))
(build-system python-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
@@ -108,6 +109,36 @@
(string-append "['" (which "stat") "',"))
(("\\['getfacl',")
(string-append "['" (which "getfacl") "',")))))
+ (add-after 'unpack 'skip-python-tests
+ (lambda _
+ ;; Python tests appear to assume python 3.9, remove
+ ;; phase when python is upgraded
+ (substitute* "tests/comparators/test_python.py"
+ (("def test_identification")
+ "def skip_test_identification"))
+ (substitute* "tests/comparators/test_python.py"
+ (("def test_diff")
+ "def skip_test_diff"))))
+ (add-after 'unpack 'use-dumppdf-py
+ ;; python-pdfminer-six ships "dumppdf" as "dumppdf.py"
+ ;;
https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/283
+ ;; Fixed upstream, remove this phase when updating to
+ ;; diffoscope 189
+ (lambda _
+ (substitute* "diffoscope/comparators/pdf.py"
+ (("dumppdf") "dumppdf.py"))
+ (substitute* "diffoscope/external_tools.py"
+ (("dumppdf") "dumppdf.py"))
+ (substitute* "diffoscope/external_tools.py"
+ (("'debian': 'python3-pdfminer'")
+ "'debian': 'python3-pdfminer', 'guix':
'python-pdfminer-six'"))))
+ (add-after 'unpack 'fpc-external-tool
+ ;; Fixed upstream, remove this phase when updating to
+ ;; diffoscope 189
+ (lambda _
+ (substitute* "diffoscope/external_tools.py"
+ (("'debian': 'fp-utils'")
+ "'debian': 'fp-utils', 'guix': 'fpc'"))))
(add-after 'build 'build-man-page
(lambda* (#:key (make-flags '()) #:allow-other-keys)
(apply invoke "make" "-C" "doc" make-flags)))
@@ -182,6 +213,7 @@
("dtc" ,dtc)
("e2fsprogs" ,e2fsprogs)
("ffmpeg" ,ffmpeg)
+ ("fpc" ,fpc)
("gettext" ,gettext-minimal)
("ghostscript" ,ghostscript)
("giflib:bin" ,giflib "bin")
diff --git
a/gnu/packages/patches/diffoscope-fix-test_item3_deflate_llvm_bitcode.patch
b/gnu/packages/patches/diffoscope-fix-llvm-test.patch
similarity index 100%
rename from
gnu/packages/patches/diffoscope-fix-test_item3_deflate_llvm_bitcode.patch
rename to gnu/packages/patches/diffoscope-fix-llvm-test.patch
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: gnu: diffoscope: Update to 188.,
guix-commits <=