me
/
guix
Archived
1
0
Fork 0
Code

gnu: diffoscope: Update to 143. 

* gnu/packages/diffoscope (diffoscope): Update to 143.
  [native-inputs]: Add openssl and python-h5py.
  [arguments] Add openssl to add-known-tools phase.
  [arguments] Remove hdf5 from add-known-tools phase, added upstream.
master
Vagrant Cascadian 2020-04-30 18:46:30 +00:00 committed by Vagrant Cascadian
parent 2a94f72ade
commit ac4fefb298
No known key found for this signature in database
GPG Key ID: DC518FC87F9716AA
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gnu/packages/diffoscope.scm
View File

@ -57,6 +57,7 @@
#:use-module (gnu packages ssh) #:use-module (gnu packages ssh)
#:use-module (gnu packages statistics) #:use-module (gnu packages statistics)
#:use-module (gnu packages textutils) #:use-module (gnu packages textutils)
#:use-module (gnu packages tls)
#:use-module (gnu packages video) #:use-module (gnu packages video)
#:use-module (gnu packages vim) #:use-module (gnu packages vim)
#:use-module (gnu packages web) #:use-module (gnu packages web)
@ -69,7 +70,7 @@
#:use-module (ice-9 match)) #:use-module (ice-9 match))
(define-public diffoscope (define-public diffoscope
(let ((version "141")) (let ((version "143"))
(package (package
(name "diffoscope") (name "diffoscope")
(version version) (version version)
@ -81,7 +82,7 @@
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0pls2jryx394ysaz0g8h959lhrsdqak9bkxjd5r6sdckgiikplkj")))) "0j58dqdk8ln8y0bcnfy37ljs37nkl56lzxqns396300ysln0qiwm"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases (modify-phases %standard-phases `(#:phases (modify-phases %standard-phases
@ -96,8 +97,8 @@
(add-after 'unpack 'add-known-tools (add-after 'unpack 'add-known-tools
(lambda _ (lambda _
(substitute* "diffoscope/external_tools.py" (substitute* "diffoscope/external_tools.py"
(("'debian': 'hdf5-tools'") (("'debian': 'openssl'")
"'debian': 'hdf5-tools', 'guix': 'hdf5'")))) "'debian': 'openssl', 'guix': 'openssl'"))))
;; 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
@ -161,6 +162,7 @@
(native-inputs `(("python-pytest" ,python-pytest) (native-inputs `(("python-pytest" ,python-pytest)
("python-chardet" ,python-chardet) ("python-chardet" ,python-chardet)
("python-binwalk" ,python-binwalk) ("python-binwalk" ,python-binwalk)
("python-h5py" ,python-h5py)
("python-pypdf2" ,python-pypdf2) ("python-pypdf2" ,python-pypdf2)
("python-progressbar33" ,python-progressbar33) ("python-progressbar33" ,python-progressbar33)
;; test suite skips tests when tool is missing ;; test suite skips tests when tool is missing
@ -205,6 +207,7 @@
("ocaml" ,ocaml) ("ocaml" ,ocaml)
("odt2txt" ,odt2txt) ("odt2txt" ,odt2txt)
("openssh" ,openssh) ("openssh" ,openssh)
("openssl" ,openssl)
("pgpdump" ,pgpdump) ("pgpdump" ,pgpdump)
("poppler" ,poppler) ("poppler" ,poppler)
("python-jsbeautifier" ,python-jsbeautifier) ("python-jsbeautifier" ,python-jsbeautifier)