diff options
author | Vagrant Cascadian <vagrant@reproducible-builds.org> | 2019-05-30 15:36:20 -0700 |
---|---|---|
committer | Vagrant Cascadian <vagrant@debian.org> | 2019-05-30 16:04:30 -0700 |
commit | ff793da66918ace85048f90dc069415ef067ba06 (patch) | |
tree | c5e3b555ac7fb0cf3abbc78ea1fb061eb17acf9a /gnu/packages | |
parent | add5ecfd68784e2e9596402a2bb0533d2fab6458 (diff) | |
download | guix-ff793da66918ace85048f90dc069415ef067ba06.tar.gz guix-ff793da66918ace85048f90dc069415ef067ba06.zip |
gnu: diffoscope: Update to version 115-1.7f3416f.
* gnu/packages/package-management (diffoscope):
[package] Update to version 115-1.7f3416f.
[source] Switch to using git-fetch.
[inputs] Move python-pytest and python-chardet ...
[native-inputs] ... to here.
[arguments] Move comment to fit line length.
Diffstat (limited to 'gnu/packages')
-rw-r--r-- | gnu/packages/package-management.scm | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 2113e49565..9e0bfb6973 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -548,13 +548,16 @@ transactions from C or Python.") (define-public diffoscope (package (name "diffoscope") - (version "114") + (version (git-version "115" "1" "7f3416ffd12572b42c814e43ac15cee44ef48155")) (source (origin - (method url-fetch) - (uri (pypi-uri name version)) + (method git-fetch) + (uri (git-reference + (url "https://salsa.debian.org/reproducible-builds/diffoscope.git") + (commit "7f3416ffd12572b42c814e43ac15cee44ef48155"))) + (file-name (git-file-name name version)) (sha256 (base32 - "07sma4izcqxdv0zi1s5fnsybvkc47c3vbpm372sg83q8l7rhizzp")))) + "1pn2rwlz5shdx7s63798wx2v7029bl5if6dlq3i2r6zsnpp0laki")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases @@ -590,7 +593,8 @@ transactions from C or Python.") #t)) (add-before 'check 'delete-failing-test (lambda _ - (delete-file "tests/test_tools.py") ;this requires /sbin to be on the path + ;; this requires /sbin to be on the path + (delete-file "tests/test_tools.py") #t))))) (inputs `(("rpm" ,rpm) ;for rpm-python ("python-file" ,python-file) @@ -599,11 +603,10 @@ transactions from C or Python.") ("python-tlsh" ,python-tlsh) ("acl" ,acl) ;for getfacl ("colordiff" ,colordiff) - ("xxd" ,xxd) - - ;; Below are modules used for tests. - ("python-pytest" ,python-pytest) - ("python-chardet" ,python-chardet))) + ("xxd" ,xxd))) + ;; Below are modules used for tests. + (native-inputs `(("python-pytest" ,python-pytest) + ("python-chardet" ,python-chardet))) (home-page "https://diffoscope.org/") (synopsis "Compare files, archives, and directories in depth") (description |