nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: diffoscope: Update to 77. 

* gnu/packages/package-management.scm (diffoscope): Update to 77.
[arguments]: Remove obsolete colordiff substitution. Adjust 'xxd' substitution
to source path renames. Fix test failure by making it required.
This commit is contained in:
Marius Bakke 2017-02-21 15:59:10 +01:00
parent 2178b580cb
commit 025519fa95
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gnu/packages/package-management.scm
View File

@ -445,13 +445,13 @@ transactions from C or Python.")
(define-public diffoscope (define-public diffoscope
(package (package
(name "diffoscope") (name "diffoscope")
(version "63") (version "77")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri name version)) (uri (pypi-uri name version))
(sha256 (sha256
(base32 (base32
"12q5d2nszql1g4jf2ss863v0wpvvhrkaivqzhy6af9m9zwvw0p0k")))) "0wrb6pl88611frxj19kq3vikhbld40fy1ncrskb1iayxsmbfcbn9"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases (modify-phases %standard-phases `(#:phases (modify-phases %standard-phases
@ -464,12 +464,7 @@ transactions from C or Python.")
(("'python-magic',") "")))) (("'python-magic',") ""))))
(add-after 'unpack 'embed-tool-references (add-after 'unpack 'embed-tool-references
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "diffoscope/difference.py" (substitute* "diffoscope/comparators/utils/compare.py"
(("@tool_required\\('colordiff'\\)") "")
(("\\[\"colordiff\"")
(string-append "[\"" (which "colordiff") "\"")))
(substitute* "diffoscope/comparators/utils.py"
(("@tool_required\\('xxd'\\)") "")
(("\\['xxd',") (("\\['xxd',")
(string-append "['" (which "xxd") "',"))) (string-append "['" (which "xxd") "',")))
(substitute* "diffoscope/comparators/elf.py" (substitute* "diffoscope/comparators/elf.py"