diff options
author | Efraim Flashner <[email protected]> | 2023-01-30 11:33:18 +0200 |
---|---|---|
committer | Efraim Flashner <[email protected]> | 2023-01-30 12:39:40 +0200 |
commit | 4cf1acc7f3033b50b0bf19e02c9f522d522d338c (patch) | |
tree | 9fd64956ee60304c15387eb394cd649e49f01467 /gnu/packages/ccache.scm | |
parent | edb8c09addd186d9538d43b12af74d6c7aeea082 (diff) | |
parent | 595b53b74e3ef57a1c0c96108ba86d38a170a241 (diff) |
Merge remote-tracking branch 'origin/master' into core-updates
Conflicts:
doc/guix.texi
gnu/local.mk
gnu/packages/admin.scm
gnu/packages/base.scm
gnu/packages/chromium.scm
gnu/packages/compression.scm
gnu/packages/databases.scm
gnu/packages/diffoscope.scm
gnu/packages/freedesktop.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/guile.scm
gnu/packages/inkscape.scm
gnu/packages/llvm.scm
gnu/packages/openldap.scm
gnu/packages/pciutils.scm
gnu/packages/ruby.scm
gnu/packages/samba.scm
gnu/packages/sqlite.scm
gnu/packages/statistics.scm
gnu/packages/syndication.scm
gnu/packages/tex.scm
gnu/packages/tls.scm
gnu/packages/version-control.scm
gnu/packages/xml.scm
guix/build-system/copy.scm
guix/scripts/home.scm
Diffstat (limited to 'gnu/packages/ccache.scm')
-rw-r--r-- | gnu/packages/ccache.scm | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/gnu/packages/ccache.scm b/gnu/packages/ccache.scm index 3ce44766fa..48f88c4b4b 100644 --- a/gnu/packages/ccache.scm +++ b/gnu/packages/ccache.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2016, 2017 Efraim Flashner <[email protected]> ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <[email protected]> ;;; Copyright © 2021, 2022 Greg Hogan <[email protected]> +;;; Copyright © 2022 Maxim Cournoyer <[email protected]> ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,25 +27,23 @@ #:use-module (guix download) #:use-module (guix build-system cmake) #:use-module (gnu packages) + #:use-module (gnu packages base) + #:use-module (gnu packages compression) #:use-module (gnu packages perl) - #:use-module (gnu packages compression)) + #:use-module (gnu packages ruby)) (define-public ccache (package (name "ccache") - (version "4.6.1") + (version "4.7.4") (source (origin (method url-fetch) (uri (string-append "https://github.com/ccache/ccache/releases/download/v" version "/ccache-" version ".tar.xz")) (sha256 - (base32 "1lgk6fbfsnh2fscjmhpak8gwp3njq3kr0ihjcjlas15mrg9ppm75")))) + (base32 "0djfm138m863g772bnq7m2mfwh3y8sqxczc3yssg1yiybp8n836z")))) (build-system cmake-build-system) - (native-inputs (list perl ; for test/run - (@ (gnu packages base) which))) - (inputs (list zlib - `(,zstd "lib"))) (arguments (list #:configure-flags ;; The backend must be explicitly disabled to build without Redis. @@ -63,6 +62,8 @@ ;; Tests require a writable HOME. (lambda _ (setenv "HOME" (getenv "TMPDIR"))))))) + (native-inputs (list perl ruby-asciidoctor which)) + (inputs (list zlib `(,zstd "lib"))) (home-page "https://ccache.dev/") (synopsis "Compiler cache") (description |