me/guix
Archived
1
0
Fork 0
Code Activity

gnu: diffoscope: Update to 141.

Browse source 
* gnu/packages/diffoscope (diffoscope): Update to 141.
  [arguments]: Add phase add-known-tools.
  [native-inputs]: Add hdf5.
This commit is contained in:
Vagrant Cascadian 2020-04-16 12:28:16 -07:00 • committed by Vagrant Cascadian
parent cdac010c19
commit 2d9886f7e8
No known key found for this signature in database
GPG key ID: DC518FC87F9716AA
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gnu/packages/diffoscope.scm
View file

@ -68,7 +68,7 @@
#:use-module (ice-9 match)) #:use-module (ice-9 match))
(define-public diffoscope (define-public diffoscope
(let ((version "139")) (let ((version "141"))
(package (package
(name "diffoscope") (name "diffoscope")
(version version) (version version)
@ -80,7 +80,7 @@
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1k4yjyvmn5nfdapkwgkr9gzpn18kr4c58n0f32pfkx4yakfqkk4i")))) "0pls2jryx394ysaz0g8h959lhrsdqak9bkxjd5r6sdckgiikplkj"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases (modify-phases %standard-phases `(#:phases (modify-phases %standard-phases
@ -91,6 +91,12 @@
(lambda _ (lambda _
(substitute* "setup.py" (substitute* "setup.py"
(("'python-magic',") "")))) (("'python-magic',") ""))))
;; Patch in support for known tools
(add-after 'unpack 'add-known-tools
(lambda _
(substitute* "diffoscope/external_tools.py"
(("'debian': 'hdf5-tools'")
"'debian': 'hdf5-tools', 'guix': 'hdf5'"))))
;; This test is broken because our `file` package has a ;; This test is broken because our `file` package has a
;; bug in berkeley-db file type detection. ;; bug in berkeley-db file type detection.
(add-after 'unpack 'remove-berkeley-test (add-after 'unpack 'remove-berkeley-test
@ -189,6 +195,7 @@
("giflib:bin" ,giflib "bin") ("giflib:bin" ,giflib "bin")
("gnumeric" ,gnumeric) ("gnumeric" ,gnumeric)
("gnupg" ,gnupg) ("gnupg" ,gnupg)
("hdf5" ,hdf5)
("imagemagick" ,imagemagick) ("imagemagick" ,imagemagick)
("libarchive" ,libarchive) ("libarchive" ,libarchive)
("llvm" ,llvm) ("llvm" ,llvm)