me/guix
Archived
1
0
Fork 0
Code Activity

gnu: diffoscope: Update to 215.

Browse source 
* gnu/packages/diffoscope.scm (diffoscope): Update to 215.
  [arguments]: Drop 'install-extract-vmlinux phase.
  [inputs]: Remove python.
This commit is contained in:
Vagrant Cascadian 2022-06-04 15:54:46 -07:00 • committed by Vagrant Cascadian
parent 32322d0926
commit 271736117e
No known key found for this signature in database
GPG key ID: DC518FC87F9716AA
1 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gnu/packages/diffoscope.scm
View file

@ -53,7 +53,6 @@
#:use-module (gnu packages pascal) #:use-module (gnu packages pascal)
#:use-module (gnu packages patchutils) #:use-module (gnu packages patchutils)
#:use-module (gnu packages pdf) #:use-module (gnu packages pdf)
#:use-module (gnu packages python)
#:use-module (gnu packages python-web) #:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
#:use-module (gnu packages sqlite) #:use-module (gnu packages sqlite)
@ -75,7 +74,7 @@
(define-public diffoscope (define-public diffoscope
(package (package
(name "diffoscope") (name "diffoscope")
(version "214") (version "215")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -84,7 +83,7 @@
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "05vzvs8yn963wzxmnqifj0zsa9scxcq3iqrq9msm0vqznb1xgp7q")) (base32 "16pyqbyrfsxjnpmr9913x2brz3mxplhz62rxwix1c0p7afwjw835"))
(patches (patches
(search-patches "diffoscope-fix-llvm-test.patch")))) (search-patches "diffoscope-fix-llvm-test.patch"))))
(build-system python-build-system) (build-system python-build-system)
@ -137,25 +136,12 @@
(lambda _ (lambda _
;; This requires /sbin to be in $PATH. ;; This requires /sbin to be in $PATH.
(delete-file "tests/test_tools.py"))) (delete-file "tests/test_tools.py")))
(add-after 'install 'install-extract-vmlinux
(lambda* (#:key outputs #:allow-other-keys)
;; Work around bug comparing vmlinux files
;; https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/305
(let* ((scriptdir (string-append (assoc-ref outputs "out")
"/lib/python"
,(version-major+minor
(package-version python))
"/site-packages/scripts/")))
(mkdir-p scriptdir)
(copy-file "scripts/extract-vmlinux"
(string-append scriptdir "/extract-vmlinux")))))
(add-after 'install 'install-man-page (add-after 'install 'install-man-page
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(man (string-append out "/share/man/man1"))) (man (string-append out "/share/man/man1")))
(install-file "doc/diffoscope.1" man))))))) (install-file "doc/diffoscope.1" man)))))))
(inputs (list rpm ;for rpm-python (inputs (list rpm ;for rpm-python
python
python-debian python-debian
python-libarchive-c python-libarchive-c
python-magic python-magic