From 3b39f09fd99cd07543b904d11ea9b3463c38ecb7 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 23 Jun 2019 23:01:32 +0200
Subject: gnu: googletest: Update to 1.8.1.

* gnu/packages/check.scm (googletest): Update to 1.8.1.
---
 gnu/packages/check.scm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'gnu/packages/check.scm')

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 2a0da625fd..e19c3d4659 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -483,17 +483,16 @@ test coverage and has a web user interface that will refresh automatically.")
 (define-public googletest
   (package
     (name "googletest")
-    (version "1.8.0")
+    (version "1.8.1")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
-              (url "https://github.com/google/googletest.git")
-              (commit (string-append "release-" version))))
+             (url "https://github.com/google/googletest.git")
+             (commit (string-append "release-" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32
-         "0bjlljmbf8glnd9qjabx73w6pd7ibv43yiyngqvmvgxsabzr8399"))))
+        (base32 "0270msj6n7mggh4xqqjp54kswbl7mkcc8px1p5dqdpmw5ngh9fzk"))))
     (build-system cmake-build-system)
     (arguments
      `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")))
-- 
cgit 1.4.1


From 57945dd70c7acd5b7e14db75df101e1978ab4a00 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Mon, 24 Jun 2019 00:25:57 +0200
Subject: gnu: znc: Switch back to Guix's googletest package.

* gnu/packages/messaging.scm (znc)[native-inputs]: Use the packaged
googletest's sources.
---
 gnu/packages/check.scm     |  2 --
 gnu/packages/messaging.scm | 16 +---------------
 2 files changed, 1 insertion(+), 17 deletions(-)

(limited to 'gnu/packages/check.scm')

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index e19c3d4659..9bc5036cf6 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -478,8 +478,6 @@ test coverage and has a web user interface that will refresh automatically.")
     (home-page "https://github.com/smartystreets/goconvey")
     (license license:expat)))
 
-;; XXX When updating, check whether ZNC's GOOGLETEST-SOURCES can be
-;; switched back to simply using (PACKAGE-SOURCE ...).
 (define-public googletest
   (package
     (name "googletest")
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 8aeefa64e1..e4f150c817 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -517,21 +517,7 @@ compromised.")
                            "--with-gtest=googletest/googletest")
        #:test-target "test"))
     (native-inputs
-     `(("googletest-source"
-        ;; ZNC 1.7 needs a newer, unreleased googletest (a release is planned
-        ;; <https://github.com/google/googletest/issues/1583>, so don't update
-        ;; the public GOOGLETEST to an unstable version).  The commit is taken
-        ;; from ‘third_party/googletest’ in the ZNC git repository.
-        ,(let ((commit "9737e63c69e94ac5777caa0bc77c77d5206467f3"))
-           (origin
-             (method git-fetch)
-             (uri (git-reference
-                   (url "https://github.com/google/googletest")
-                   (commit commit)))
-             (file-name (git-file-name "googletest-for-znc" commit))
-             (sha256
-              (base32
-               "0ya36n8d62zbxk6p22yffgx43mqhx2fz41gqqwbpdshjryf3wvxj")))))
+     `(("googletest-source" ,(package-source googletest))
        ("pkg-config" ,pkg-config)
        ("perl" ,perl)
        ("python" ,python)))
-- 
cgit 1.4.1