summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVagrant Cascadian <vagrant@reproducible-builds.org>2020-06-19 19:49:16 +0000
committerVagrant Cascadian <vagrant@debian.org>2020-06-19 14:06:29 -0700
commitd72009bf0841b55e460bcc049e3723c3bd4f6603 (patch)
tree582a30a821da763037755db2bbbb80e9450b6a5a
parentgnu: sudo: Update to 1.9.1. (diff)
downloadguix-d72009bf0841b55e460bcc049e3723c3bd4f6603.tar.gz
guix-d72009bf0841b55e460bcc049e3723c3bd4f6603.tar.bz2
guix-d72009bf0841b55e460bcc049e3723c3bd4f6603.tar.xz
gnu: diffoscope: Update to 148.
* gnu/packages/diffoscope (diffoscope): Update to 148. [arguments] Remove add-known-tools phase, fixed upstream.
-rw-r--r--gnu/packages/diffoscope.scm10
1 files changed, 2 insertions, 8 deletions
diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm
index 51a1127..f5387f8 100644
--- a/gnu/packages/diffoscope.scm
+++ b/gnu/packages/diffoscope.scm
@@ -72,7 +72,7 @@
72(define-public diffoscope 72(define-public diffoscope
73 (package 73 (package
74 (name "diffoscope") 74 (name "diffoscope")
75 (version "147") 75 (version "148")
76 (source (origin 76 (source (origin
77 (method git-fetch) 77 (method git-fetch)
78 (uri (git-reference 78 (uri (git-reference
@@ -81,7 +81,7 @@
81 (file-name (git-file-name name version)) 81 (file-name (git-file-name name version))
82 (sha256 82 (sha256
83 (base32 83 (base32
84 "0vfj9zv9mh9fffnm3h721yfkrkksv6667x6xjihvmfs8j9javgaz")))) 84 "0siv5z8iqgkzl51dmv69ifqids6hqmiir00yyl1aaqbginrwyhyv"))))
85 (build-system python-build-system) 85 (build-system python-build-system)
86 (arguments 86 (arguments
87 `(#:phases (modify-phases %standard-phases 87 `(#:phases (modify-phases %standard-phases
@@ -92,12 +92,6 @@
92 (lambda _ 92 (lambda _
93 (substitute* "setup.py" 93 (substitute* "setup.py"
94 (("'python-magic',") "")))) 94 (("'python-magic',") ""))))
95 ;; Patch in support for known tools
96 (add-after 'unpack 'add-known-tools
97 (lambda _
98 (substitute* "diffoscope/external_tools.py"
99 (("'debian': 'openssl'")
100 "'debian': 'openssl', 'guix': 'openssl'"))))
101 ;; This test is broken because our `file` package has a 95 ;; This test is broken because our `file` package has a
102 ;; bug in berkeley-db file type detection. 96 ;; bug in berkeley-db file type detection.
103 (add-after 'unpack 'remove-berkeley-test 97 (add-after 'unpack 'remove-berkeley-test