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

gnu: diffoscope: Fix error messages related to comparison tools. 

* gnu/packages/package-management.scm (diffoscope)[arguments]: Replace readelf
substitution and add stat and getfacl substitutions.
[inputs]: Add acl.

Errors fixed include the following:
  "FileNotFoundError: [Errno 2] No such file or directory: 'readelf'"
  "diffoscope.comparators.directory: Unable to find 'getfacl', some directory
   metadata differences might not be noticed."
  "diffoscope.comparators.directory: Unable to find 'stat'"
This commit is contained in:
Kei Kebreau 2017-11-24 15:58:57 -05:00
parent 5ea35b42e4
commit 2af6be91d5
No known key found for this signature in database
GPG Key ID: E6A5EE3C19467A0D
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,6 +63,7 @@
#:use-module (gnu packages ssh) #:use-module (gnu packages ssh)
#:use-module (gnu packages vim) #:use-module (gnu packages vim)
#:use-module (gnu packages serialization) #:use-module (gnu packages serialization)
#:use-module (gnu packages acl)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (ice-9 match)) #:use-module (ice-9 match))
@ -520,7 +521,6 @@ transactions from C or Python.")
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases (modify-phases %standard-phases `(#:phases (modify-phases %standard-phases
(add-before 'unpack 'n (lambda _ #t))
;; setup.py mistakenly requires python-magic from PyPi, even ;; setup.py mistakenly requires python-magic from PyPi, even
;; though the Python bindings of `file` are sufficient. ;; though the Python bindings of `file` are sufficient.
;; https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815844 ;; https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815844
@ -535,8 +535,15 @@ transactions from C or Python.")
(string-append "['" (which "xxd") "',"))) (string-append "['" (which "xxd") "',")))
(substitute* "diffoscope/comparators/elf.py" (substitute* "diffoscope/comparators/elf.py"
(("@tool_required\\('readelf'\\)") "") (("@tool_required\\('readelf'\\)") "")
(("\\['readelf',") (("get_tool_name\\('readelf'\\)")
(string-append "['" (which "readelf") "',"))) (string-append "'" (which "readelf") "'")))
(substitute* "diffoscope/comparators/directory.py"
(("@tool_required\\('stat'\\)") "")
(("@tool_required\\('getfacl'\\)") "")
(("\\['stat',")
(string-append "['" (which "stat") "',"))
(("\\['getfacl',")
(string-append "['" (which "getfacl") "',")))
#t)) #t))
(add-before 'check 'delete-failing-test (add-before 'check 'delete-failing-test
(lambda _ (lambda _
@ -547,6 +554,7 @@ transactions from C or Python.")
("python-debian" ,python-debian) ("python-debian" ,python-debian)
("python-libarchive-c" ,python-libarchive-c) ("python-libarchive-c" ,python-libarchive-c)
("python-tlsh" ,python-tlsh) ("python-tlsh" ,python-tlsh)
("acl" ,acl) ;for getfacl
("colordiff" ,colordiff) ("colordiff" ,colordiff)
("xxd" ,xxd) ("xxd" ,xxd)