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

gnu: diffoscope: Update to 63. 

* gnu/packages/package-management.scm (diffoscope): Update to 63.
[arguments]: Remove obsolete 'disable-failing-test' and 'disable-egg-zipping'
phases. The former was fixed upstream, and the latter is fixed by the new Python
build system.
This commit is contained in:
Leo Famulari 2016-12-11 01:48:03 -05:00
parent 0e8b7b1c35
commit b245f7589e
No known key found for this signature in database
GPG Key ID: 2646FA30BACA7F08
1 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -482,13 +482,13 @@ transactions from C or Python.")
(define-public diffoscope (define-public diffoscope
(package (package
(name "diffoscope") (name "diffoscope")
(version "62") (version "63")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri name version)) (uri (pypi-uri name version))
(sha256 (sha256
(base32 (base32
"127b4gsw11hjbha5jpz5i42pc142h52pwzs1p792047y0j1yjg8z")))) "12q5d2nszql1g4jf2ss863v0wpvvhrkaivqzhy6af9m9zwvw0p0k"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases (modify-phases %standard-phases `(#:phases (modify-phases %standard-phases
@ -498,22 +498,7 @@ transactions from C or Python.")
(add-after 'unpack 'dependency-on-python-magic (add-after 'unpack 'dependency-on-python-magic
(lambda _ (lambda _
(substitute* "setup.py" (substitute* "setup.py"
(("'python-magic',") "")))) (("'python-magic',") "")))))))
;; The test suite assumes we have pytest >= 2.9.0.
;; https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=841146
(add-after 'unpack 'disable-failing-test
(lambda _
(substitute* "tests/comparators/utils.py"
(("skip\\(reason\\=\\\"requires \\{\\}\\\"\\.format\\(tool\\)\\)")
"skipif(True, reason=\"Requires pytest >= 2.9\")"))))
(add-before 'build 'disable-egg-zipping
(lambda _
;; Leave the .egg file uncompressed.
(let ((port (open-file "setup.cfg" "a")))
(display "\n[easy_install]\nzip_ok = 0\n"
port)
(close-port port)
#t))))))
(inputs `(("rpm" ,rpm) ;for rpm-python (inputs `(("rpm" ,rpm) ;for rpm-python
("python-file" ,python-file) ("python-file" ,python-file)
("python-debian" ,python-debian) ("python-debian" ,python-debian)