amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'staging' into core-updates

Browse source
This commit is contained in:
Marius Bakke 2022-07-22 01:09:14 +02:00
commit 9044b086dd
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
289 changed files with 222361 additions and 156771 deletions
Download patch file Download diff file Expand all files Collapse all files

17
gnu/packages/diffoscope.scm
View file

@ -5,6 +5,7 @@
;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2018, 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2019 Vagrant Cascadian <vagrant@reproducible-builds.org>
;;; Copyright © 2022 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
@ -73,7 +74,7 @@
(define-public diffoscope
(package
(name "diffoscope")
(version "217")
(version "219")
(source
(origin
(method git-fetch)
@ -82,7 +83,7 @@
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0vbyg8lm5ddrdkhahcs70rhdmz42blppzliryghxcyyxs7g3gzq5"))
(base32 "0n6dn53paxi1316fnv5abw5rlvpfd2kpfn3b08wfzrcb6chsx7br"))
(patches
(search-patches "diffoscope-fix-llvm-test.patch"))))
(build-system python-build-system)
@ -171,9 +172,15 @@
docx2txt
dtc
e2fsprogs
ffmpeg
fpc
gettext-minimal
ffmpeg)
(match (%current-system)
;; fpc is only available on x86 currently.
((or "x86_64-linux" "i686-linux")
(list fpc))
(_ '()))
(list gettext-minimal
ghostscript
`(,giflib "bin")
gnumeric