me/guix
Archived
1
0
Fork 0
Code Activity

gnu: diffoscope: Fix embedded tool references.

Browse source 
Upstream switched from using '' to "" in various places.
Drop patching of "readelf" which broke tests.

* gnu/packages/diffoscope.scm (diffoscope)[arguments]: Update
  'fix-embed-tool-references phase.
  [inputs]: Add coreutils and diffutils.
This commit is contained in:
Vagrant Cascadian 2022-06-01 19:17:50 -07:00 • committed by Vagrant Cascadian
parent 32f001ce48
commit 1d72225903
No known key found for this signature in database
GPG key ID: DC518FC87F9716AA
1 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
gnu/packages/diffoscope.scm
View file

@ -98,19 +98,19 @@
(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/comparators/utils/compare.py" (substitute* "diffoscope/comparators/utils/compare.py"
(("\\['xxd',") (("\\[\"xxd\",")
(string-append "['" (which "xxd") "',"))) (string-append "[\"" (which "xxd") "\",")))
(substitute* "diffoscope/comparators/elf.py" (substitute* "diffoscope/diff.py"
(("@tool_required\\('readelf'\\)") "") (("@tool_required\\(\"diff\"\\)") "")
(("get_tool_name\\('readelf'\\)") (("get_tool_name\\(\"diff\"\\)")
(string-append "'" (which "readelf") "'"))) (string-append "get_tool_name(\"" (which "diff") "\")")))
(substitute* "diffoscope/comparators/directory.py" (substitute* "diffoscope/comparators/directory.py"
(("@tool_required\\('stat'\\)") "") (("@tool_required\\(\"stat\"\\)") "")
(("@tool_required\\('getfacl'\\)") "") (("@tool_required\\(\"getfacl\"\\)") "")
(("\\['stat',") (("\\[\"stat\",")
(string-append "['" (which "stat") "',")) (string-append "[\"" (which "stat") "\","))
(("\\['getfacl',") (("\\[\"getfacl\",")
(string-append "['" (which "getfacl") "',"))))) (string-append "[\"" (which "getfacl") "\",")))))
(add-after 'build 'build-man-page (add-after 'build 'build-man-page
(lambda* (#:key (make-flags '()) #:allow-other-keys) (lambda* (#:key (make-flags '()) #:allow-other-keys)
(apply invoke "make" "-C" "doc" make-flags))) (apply invoke "make" "-C" "doc" make-flags)))
@ -147,7 +147,8 @@
python-magic python-magic
python-tlsh python-tlsh
acl ;for getfacl acl ;for getfacl
colordiff coreutils ;for stat
diffutils ;for diff
xxd)) xxd))
(native-inputs (native-inputs
(append (append