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

gnu: diffoscope: Update to 123. 

* gnu/packages/package-management (diffoscope): Update to 123.
  [arguments]: Update phase writable-test-data to include tests directory.
    Add phase remove-ocaml-test.
This commit is contained in:
Vagrant Cascadian 2019-09-07 15:35:14 -07:00 committed by Vagrant Cascadian
parent 9f74bd317f
commit 3ec8c0ca94
No known key found for this signature in database
GPG Key ID: DC518FC87F9716AA
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -546,7 +546,7 @@ transactions from C or Python.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public diffoscope (define-public diffoscope
(let ((version "122")) (let ((version "123"))
(package (package
(name "diffoscope") (name "diffoscope")
(version version) (version version)
@ -558,7 +558,7 @@ transactions from C or Python.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1pwddknk8qyv88ba63why8vbnlc14b47434lv4ijx49m7ya3zfvg")))) "11bxms5rkhi0v4pxx29v4qgvhp3fmf0fkzci6gn5xcv4fl1zy4wj"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases (modify-phases %standard-phases `(#:phases (modify-phases %standard-phases
@ -575,6 +575,13 @@ transactions from C or Python.")
(lambda _ (lambda _
(delete-file "tests/comparators/test_berkeley_db.py") (delete-file "tests/comparators/test_berkeley_db.py")
#t)) #t))
;; Test is dynamically generated and may have false
;; negatives with different ocaml versions. Further
;; background in: https://bugs.debian.org/939386
(add-after 'unpack 'remove-ocaml-test
(lambda _
(delete-file "tests/comparators/test_ocaml.py")
#t))
(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"
@ -594,10 +601,9 @@ transactions from C or Python.")
#t)) #t))
(add-before 'check 'writable-test-data (add-before 'check 'writable-test-data
(lambda _ (lambda _
;; tests/comparators/test_elf.py needs write access to ;; tests may need needs write access to tests
;; test data ;; directory
(make-file-writable (for-each make-file-writable (find-files "tests"))
"tests/data/ignore_readelf_errors_expected_diff")
#t)) #t))
(add-before 'check 'delete-failing-test (add-before 'check 'delete-failing-test
(lambda _ (lambda _