ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 22:08:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: diffoscope: Update to 126.

Browse source 
* gnu/packages/diffoscope (diffoscope): Update to 126.
  [arguments]: Remove add-known-tools phase, merged upstream.
This commit is contained in:
Vagrant Cascadian 2019-10-16 18:18:00 -07:00 committed by Vagrant Cascadian
parent 837b3c5d69
commit c3704ecaa5
No known key found for this signature in database
GPG key ID: DC518FC87F9716AA
1 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gnu/packages/diffoscope.scm
View file

@ -67,7 +67,7 @@ (define-module (gnu packages diffoscope)
#:use-module (ice-9 match))
(define-public diffoscope
(let ((version "125"))
(let ((version "126"))
(package
(name "diffoscope")
(version version)
@ -79,7 +79,7 @@ (define-public diffoscope
(file-name (git-file-name name version))
(sha256
(base32
"02kwisp9j63w27hhcwpdhg66dgxzz61q4fcyfz8z4hwlz6r0gyqy"))))
"0lmn2116g5l05nns8qd2kwsnnd144zrqhs53fsr88inzf0mkqwhj"))))
(build-system python-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
@ -90,18 +90,6 @@ (define-public diffoscope
(lambda _
(substitute* "setup.py"
(("'python-magic',") ""))))
;; Patch in support for known tools
(add-after 'unpack 'add-known-tools
(lambda _
(substitute* "diffoscope/external_tools.py"
(("'arch': 'enjarify'},")
"'arch': 'enjarify', 'guix': 'enjarify'},"))
(substitute* "diffoscope/external_tools.py"
(("'arch': 'python-jsbeautifier'},")
"'arch': 'python-jsbeautifier', 'guix': 'python-jsbeautifier'},"))
(substitute* "diffoscope/external_tools.py"
(("'arch': 'wabt'},")
"'arch': 'wabt', 'guix': 'wabt'},"))))
;; This test is broken because our `file` package has a
;; bug in berkeley-db file type detection.
(add-after 'unpack 'remove-berkeley-test