diff options
| author | Marius Bakke <[email protected]> | 2022-07-22 01:09:14 +0200 |
|---|---|---|
| committer | Marius Bakke <[email protected]> | 2022-07-22 01:09:14 +0200 |
| commit | 9044b086ddca64a62966a83cbf1b82d32dece89e (patch) | |
| tree | 2c7f910c9100b2f2a752d07fe0ec44be83fb7600 /gnu/packages/diffoscope.scm | |
| parent | 5dfc6ab1ab292b87ceea144aa661d0e64c834031 (diff) | |
| parent | abea091dbef2d44e6eb46bd2413bdf917e14d095 (diff) | |
Merge branch 'staging' into core-updates
Diffstat (limited to 'gnu/packages/diffoscope.scm')
| -rw-r--r-- | gnu/packages/diffoscope.scm | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 0c4acdee0b..f7190a32a0 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2018 Julien Lepiller <[email protected]> ;;; Copyright © 2018, 2019 Rutger Helling <[email protected]> ;;; Copyright © 2019 Vagrant Cascadian <[email protected]> +;;; Copyright © 2022 Efraim Flashner <[email protected]> ;;; ;;; 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 |