Subject: [bug#73760] [PATCH] gnu: Upgrade googlebenchmark

From: Greg Hogan <[email-masked]>
Date: Fri, 21 Mar 2025 09:55:56 -0400

On Fri, Oct 11, 2024 at 9:43 PM Aaron Covrig via Guix-patches via
<[email-masked]> wrote:
>
> * gnu/packages/check.scm (googlebenchmark): Upgrade to 1.9.0
> ---
>  gnu/packages/check.scm | 30 ++++++++++++++++--------------
>  1 file changed, 16 insertions(+), 14 deletions(-)
>
> diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
> index 8d41996c71..e0bd71e6d3 100644
> --- a/gnu/packages/check.scm
> +++ b/gnu/packages/check.scm
> @@ -105,6 +105,7 @@ (define-module (gnu packages check)
>    #:use-module (gnu packages texinfo)
>    #:use-module (gnu packages time)
>    #:use-module (gnu packages xml)
> +  #:use-module (gnu packages version-control)
>    #:use-module (guix utils)
>    #:use-module ((guix licenses) #:prefix license:)
>    #:use-module (guix packages)
> @@ -1098,24 +1099,25 @@ (define-public googletest-1.8
>  (define-public googlebenchmark
>    (package
>      (name "googlebenchmark")
> -    (version "1.8.3")
> +    (version "1.9.0")
>      (home-page "https://github.com/google/benchmark")
> -    (source (origin
> -              (method git-fetch)
> -              (uri (git-reference (url home-page)
> -                                  (commit (string-append "v" version))))
> -              (file-name (git-file-name "google-benchmark" version))
> -              (sha256
> -               (base32
> -                "1hf8xrdd9k57kw3mpdi68a78fd96vzdqv3179v2yy5dxx336ffw3"))))
> +    (source
> +     (origin
> +       (method git-fetch)
> +       (uri (git-reference
> +             (url home-page)
> +             (commit (string-append "v" version))))
> +       (file-name (git-file-name "google-benchmark" version))
> +       (sha256
> +        (base32 "0pvv6vww5qgkl821rn6jhh2bmfjqs6amkcj4ybws4pg1i0y7bjg5"))))
>      (build-system cmake-build-system)
>      (arguments
>       '(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON"
> -                               (string-append
> -                                "-DGOOGLETEST_PATH="
> -                                (assoc-ref %build-inputs "googletest")))))
> -    (inputs
> -     `(("googletest" ,(package-source googletest))))
> +                               (string-append "-DGOOGLETEST_PATH="
> +                                              (assoc-ref %build-inputs
> +                                                         "googletest")))))
> +    (inputs `(("git" ,git)
> +              ("googletest" ,(package-source googletest))))
>      (synopsis "C++ library to support the benchmarking of functions")
>      (description
>       "The googlebenchmark C++ library support the benchmarking of functions,
>
> base-commit: b8fd792ea267cb920da0651074a533d8abf00488
> --
> 2.46.0

Hi Aaron,

I see there is now a 1.9.1 release.

Why was git added as an input? If it's for the project version
parsing, git is not required for tagged releases:

-- Could NOT find Git (missing: GIT_EXECUTABLE)
-- Google Benchmark version: v1.9.1, normalized to 1.9.1

Also, I think we prefer to leave the formatting unchanged when making
simple changes like this.

Greg