TakeV/guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gnu: diffoscope: Update to version 115-1.7f3416f.

Browse source 
* 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.
This commit is contained in:
Vagrant Cascadian 2019-05-30 15:36:20 -07:00 committed by Vagrant Cascadian
parent add5ecfd68
commit ff793da669
No known key found for this signature in database
GPG key ID: DC518FC87F9716AA
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
gnu/packages/package-management.scm
View file

@ -548,13 +548,16 @@ (define-public rpm
(define-public diffoscope (define-public diffoscope
(package (package
(name "diffoscope") (name "diffoscope")
(version "114") (version (git-version "115" "1" "7f3416ffd12572b42c814e43ac15cee44ef48155"))
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (pypi-uri name version)) (uri (git-reference
(url "https://salsa.debian.org/reproducible-builds/diffoscope.git")
(commit "7f3416ffd12572b42c814e43ac15cee44ef48155")))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"07sma4izcqxdv0zi1s5fnsybvkc47c3vbpm372sg83q8l7rhizzp")))) "1pn2rwlz5shdx7s63798wx2v7029bl5if6dlq3i2r6zsnpp0laki"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases (modify-phases %standard-phases `(#:phases (modify-phases %standard-phases
@ -590,7 +593,8 @@ (define-public diffoscope
#t)) #t))
(add-before 'check 'delete-failing-test (add-before 'check 'delete-failing-test
(lambda _ (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))))) #t)))))
(inputs `(("rpm" ,rpm) ;for rpm-python (inputs `(("rpm" ,rpm) ;for rpm-python
("python-file" ,python-file) ("python-file" ,python-file)
@ -599,11 +603,10 @@ (define-public diffoscope
("python-tlsh" ,python-tlsh) ("python-tlsh" ,python-tlsh)
("acl" ,acl) ;for getfacl ("acl" ,acl) ;for getfacl
("colordiff" ,colordiff) ("colordiff" ,colordiff)
("xxd" ,xxd) ("xxd" ,xxd)))
;; Below are modules used for tests.
;; Below are modules used for tests. (native-inputs `(("python-pytest" ,python-pytest)
("python-pytest" ,python-pytest) ("python-chardet" ,python-chardet)))
("python-chardet" ,python-chardet)))
(home-page "https://diffoscope.org/") (home-page "https://diffoscope.org/")
(synopsis "Compare files, archives, and directories in depth") (synopsis "Compare files, archives, and directories in depth")
(description (description