From 071d4bdc80cbf6b3a5c1232f0d704878431a864f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 3 Nov 2022 21:39:00 -0400 Subject: [PATCH] gnu: ccache: Update to 4.7.2. * gnu/packages/ccache.scm (ccache): Update to 4.7.2. Move inputs fields after arguments field. [native-inputs]: Add ruby-asciidoctor to generate man page. --- gnu/packages/ccache.scm | 15 ++++++++------- gnu/packages/jami.scm | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/gnu/packages/ccache.scm b/gnu/packages/ccache.scm index 0dd1f14f58..a2e5b35046 100644 --- a/gnu/packages/ccache.scm +++ b/gnu/packages/ccache.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2021, 2022 Greg Hogan +;;; Copyright © 2022 Maxim Cournoyer ;;; ;;; 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.3") + (version "4.7.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/ccache/ccache/releases/download/v" version "/ccache-" version ".tar.xz")) (sha256 - (base32 "08lbzlcb4clc298nsjcqcnhw69p53xk7hni5p19jaqqjn4djafhy")))) + (base32 "1bsf27dii1bm6bamvs6gi6vm5pjrd0956vf8597ix76lfyjpbjhp")))) (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 diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index ae4fb653bd..e97d5a21cb 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -133,7 +133,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0n9hyqr57hhbmq35iqq5ihavj22gxzsspv0f8i6ajxwd4029nmcl")))) + "1vzfpiwhd96a9ibk398z922a60j18xd7mblsmi6355r7ccj2aw7p")))) (arguments (substitute-keyword-arguments (package-arguments pjproject) ((#:phases phases '%standard-phases)