diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-12-20 19:22:40 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-01-07 18:18:11 +0100 |
| commit | 3293fad24a18fda7687a2ad8773ab9e01a1e05e6 (patch) | |
| tree | c068c281425716144359eb837550897e56ae416c | |
| parent | 9020252114fba444556152a36b98b2015bb1d362 (diff) | |
| download | guix-3293fad24a18fda7687a2ad8773ab9e01a1e05e6.tar.gz | |
gnu: googletest: Update to 1.10.0.
* gnu/packages/check.scm (googletest): Update to 1.10.0. (googletest-1.8): New public variable. * gnu/packages/audio.scm (cli-visualizer)[inputs]: Change from GOOGLETEST to GOOGLETEST-1.8. * gnu/packages/serialization.scm (msgpack)[native-inputs]: Likewise.
| -rw-r--r-- | gnu/packages/audio.scm | 3 | ||||
| -rw-r--r-- | gnu/packages/check.scm | 20 | ||||
| -rw-r--r-- | gnu/packages/serialization.scm | 2 |
3 files changed, 20 insertions, 5 deletions
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 55a34460b1..cf06732e18 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3592,7 +3592,8 @@ the following features: `(("which" ,which))) (inputs `(("fftw" ,fftw) - ("googletest" ,googletest) + ;; TODO: Try using the latest googletest for versions > 1.6. + ("googletest" ,googletest-1.8) ("ncurses" ,ncurses) ("pulseaudio" ,pulseaudio))) (arguments diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 9de658e790..367f87e2e2 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -25,7 +25,7 @@ ;;; Copyright © 2017, 2019 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2017 ng0 <ng0@n0.is> ;;; Copyright © 2015, 2017, 2018 Ricardo Wurmus <rekado@elephly.net> -;;; Copyright © 2016, 2017, 2018, 2019 Marius Bakke <mbakke@fastmail.com> +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017, 2018 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2018 Fis Trivial <ybbs.daans@hotmail.com> ;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.com> @@ -505,7 +505,7 @@ test coverage and has a web user interface that will refresh automatically.") (define-public googletest (package (name "googletest") - (version "1.8.1") + (version "1.10.0") (source (origin (method git-fetch) @@ -514,7 +514,7 @@ test coverage and has a web user interface that will refresh automatically.") (commit (string-append "release-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0270msj6n7mggh4xqqjp54kswbl7mkcc8px1p5dqdpmw5ngh9fzk")))) + (base32 "1zbmab9295scgg4z2vclgfgjchfjailjnvzc6f5x9jvlsdi3dpwz")))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON"))) @@ -527,6 +527,20 @@ discovery, death tests, assertions, parameterized tests and XML test report generation.") (license license:bsd-3))) +(define-public googletest-1.8 + (package/inherit + googletest + (version "1.8.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/google/googletest.git") + (commit (string-append "release-" version)))) + (file-name (git-file-name "googletest" version)) + (sha256 + (base32 + "0270msj6n7mggh4xqqjp54kswbl7mkcc8px1p5dqdpmw5ngh9fzk")))))) + (define-public cpputest (package (name "cpputest") diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 137ecce4e4..cf80237f11 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -123,7 +123,7 @@ such as compact binary encodings, XML, or JSON.") (base32 "1ljqmgscdb0f8w8kx2lnswnisyxchcmijbjbmswkv0g187bvqg23")))) (build-system cmake-build-system) (native-inputs - `(("googletest" ,googletest) + `(("googletest" ,googletest-1.8) ("pkg-config" ,pkg-config))) (propagated-inputs `(("zlib" ,zlib))) ;; Msgpack installs two headers (zbuffer.h, |