ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-26 06:18:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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