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

gnu: Update diffoscope to 121. 

* gnu/packages/package-management (diffoscope): Update to 121.
  [version] Only define version once.
  [arguments] Add writeable-test-data phase.
This commit is contained in:
Vagrant Cascadian 2019-08-19 20:36:22 +00:00 committed by Vagrant Cascadian
parent 6063a56140
commit 8c1379ba40
No known key found for this signature in database
GPG Key ID: DC518FC87F9716AA
1 changed files with 74 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -561,18 +561,19 @@ transactions from C or Python.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public diffoscope (define-public diffoscope
(let ((version "121"))
(package (package
(name "diffoscope") (name "diffoscope")
(version "120") (version version)
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://salsa.debian.org/reproducible-builds/diffoscope.git") (url "https://salsa.debian.org/reproducible-builds/diffoscope.git")
(commit "120"))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"07z9yclvfkw4326739l2ywzzihax5vdijiaqqpfix9rz1rb923aa")))) "1bw7s8qs1vnr93vhifl6pj6h6w6r6nrpc5anzhh9wx2gcaipkb3m"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases (modify-phases %standard-phases `(#:phases (modify-phases %standard-phases
@ -606,6 +607,13 @@ transactions from C or Python.")
(("\\['getfacl',") (("\\['getfacl',")
(string-append "['" (which "getfacl") "',"))) (string-append "['" (which "getfacl") "',")))
#t)) #t))
(add-before 'check 'writable-test-data
(lambda _
;; tests/comparators/test_elf.py needs write access to
;; test data
(make-file-writable
"tests/data/ignore_readelf_errors_expected_diff")
#t))
(add-before 'check 'delete-failing-test (add-before 'check 'delete-failing-test
(lambda _ (lambda _
;; this requires /sbin to be on the path ;; this requires /sbin to be on the path
@ -629,7 +637,7 @@ transactions from C or Python.")
different. It recursively unpacks archives of many kinds and transforms different. It recursively unpacks archives of many kinds and transforms
various binary formats into more human readable forms to compare them. It can various binary formats into more human readable forms to compare them. It can
compare two tarballs, ISO images, or PDFs just as easily.") compare two tarballs, ISO images, or PDFs just as easily.")
(license license:gpl3+))) (license license:gpl3+))))
(define-public trydiffoscope (define-public trydiffoscope
(package (package