me
/
guix
Archived
1
0
Fork 0

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.
master
Marius Bakke 2019-12-20 19:22:40 +01:00
parent 9020252114
commit 3293fad24a
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
3 changed files with 20 additions and 5 deletions

View File

@ -3592,7 +3592,8 @@ the following features:
`(("which" ,which))) `(("which" ,which)))
(inputs (inputs
`(("fftw" ,fftw) `(("fftw" ,fftw)
("googletest" ,googletest) ;; TODO: Try using the latest googletest for versions > 1.6.
("googletest" ,googletest-1.8)
("ncurses" ,ncurses) ("ncurses" ,ncurses)
("pulseaudio" ,pulseaudio))) ("pulseaudio" ,pulseaudio)))
(arguments (arguments

View File

@ -25,7 +25,7 @@
;;; Copyright © 2017, 2019 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2017, 2019 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2017 ng0 <ng0@n0.is> ;;; Copyright © 2017 ng0 <ng0@n0.is>
;;; Copyright © 2015, 2017, 2018 Ricardo Wurmus <rekado@elephly.net> ;;; 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 © 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018 Fis Trivial <ybbs.daans@hotmail.com> ;;; Copyright © 2018 Fis Trivial <ybbs.daans@hotmail.com>
;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.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 (define-public googletest
(package (package
(name "googletest") (name "googletest")
(version "1.8.1") (version "1.10.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -514,7 +514,7 @@ test coverage and has a web user interface that will refresh automatically.")
(commit (string-append "release-" version)))) (commit (string-append "release-" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0270msj6n7mggh4xqqjp54kswbl7mkcc8px1p5dqdpmw5ngh9fzk")))) (base32 "1zbmab9295scgg4z2vclgfgjchfjailjnvzc6f5x9jvlsdi3dpwz"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:configure-flags '("-DBUILD_SHARED_LIBS=ON"))) `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")))
@ -527,6 +527,20 @@ discovery, death tests, assertions, parameterized tests and XML test report
generation.") generation.")
(license license:bsd-3))) (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 (define-public cpputest
(package (package
(name "cpputest") (name "cpputest")

View File

@ -123,7 +123,7 @@ such as compact binary encodings, XML, or JSON.")
(base32 "1ljqmgscdb0f8w8kx2lnswnisyxchcmijbjbmswkv0g187bvqg23")))) (base32 "1ljqmgscdb0f8w8kx2lnswnisyxchcmijbjbmswkv0g187bvqg23"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
`(("googletest" ,googletest) `(("googletest" ,googletest-1.8)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(propagated-inputs (propagated-inputs
`(("zlib" ,zlib))) ;; Msgpack installs two headers (zbuffer.h, `(("zlib" ,zlib))) ;; Msgpack installs two headers (zbuffer.h,