[bug#30390] [PATCH 0/3] Update cmake to 3.10.2.

[bug#30390] [PATCH 0/3] Update cmake to 3.10.2.

[Arun Isaac]

Looks like we have missed several releases of cmake. I have upgraded to
3.10.2, the latest release.

About the jsoncpp circular dependency:

jsoncpp upstream has switched from the cmake build system to the meson build
system. So, the circular dependency can now be avoided. I was able to
successfully build jsoncpp with our meson-build-system. However, cmake failed
to build with this new jsoncpp. I couldn't figure out how to proceed. So, I
abandoned that effort, and left cmake to use its bundled jsoncpp.

About the bundled libuv:

The cmake build fails if the bundled libuv is deleted (look at the
snippet). I had to avoid deleting it for the build to work.

Arun Isaac (3):
  gnu: Add rhash.
  gnu: libuv: Update to 1.19.1.
  gnu: cmake: Update to 3.10.2.

 gnu/local.mk                               |   1 -
 gnu/packages/cmake.scm                     | 153 ++++++++++++++++-------------
 gnu/packages/crypto.scm                    |  50 ++++++++++
 gnu/packages/libevent.scm                  |  20 ++--
 gnu/packages/patches/cmake-fix-tests.patch | 120 ----------------------
 5 files changed, 143 insertions(+), 201 deletions(-)
 delete mode 100644 gnu/packages/patches/cmake-fix-tests.patch

-- 
2.15.1

[bug#30390] [PATCH 1/3] gnu: Add rhash.

[Arun Isaac]

* gnu/packages/crypto.scm (rhash): New variable.
---
 gnu/packages/crypto.scm | 50 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm
index e616c9223..65d1283e1 100644
--- a/gnu/packages/crypto.scm
+++ b/gnu/packages/crypto.scm
@@ -8,6 +8,7 @@
 ;;; Copyright © 2016, 2017 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2017 Pierre Langlois <pierre.langlois@gmx.com>
 ;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -663,3 +664,52 @@ that are faster than MD5, SHA-1, SHA-2, and SHA-3, yet are at least as secure
 as the latest standard, SHA-3.  It is an improved version of the SHA-3 finalist
 BLAKE.")
       (license license:public-domain))))
+
+(define-public rhash
+  (package
+    (name "rhash")
+    (version "1.3.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/rhash/RHash/archive/v"
+                           version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0bhz3xdl6r06k1bqigdjz42l31iqz2qdpg7zk316i7p2ra56iq4q"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:make-flags (list "CC=gcc"
+                          (string-append "PREFIX=" %output))
+       #:test-target "test"
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'configure
+           (lambda* (#:key outputs #:allow-other-keys)
+             (substitute* "Makefile"
+               (("\\$\\(DESTDIR\\)/etc")
+                (string-append (assoc-ref outputs "out") "/etc")))
+             #t))
+         (add-after 'build 'build-library
+           (lambda* (#:key outputs make-flags #:allow-other-keys)
+             (apply invoke "make" "lib-shared" make-flags)
+             #t))
+         (add-after 'install 'install-library
+           (lambda* (#:key outputs make-flags #:allow-other-keys)
+             (apply invoke "make" "install-lib-shared" make-flags)
+             (apply invoke
+                    "make" "-C" "librhash" "install-headers"
+                    "install-so-link" make-flags)
+             #t))
+         (add-after 'check 'check-library
+           (lambda* (#:key outputs make-flags #:allow-other-keys)
+             (apply invoke "make" "test-shared-lib" make-flags)
+             #t)))))
+    (home-page "https://sourceforge.net/projects/rhash/")
+    (synopsis "Utility for computing hash sums")
+    (description "RHash is a console utility for calculation and verification
+of magnet links and a wide range of hash sums like CRC32, MD4, MD5, SHA1,
+SHA256, SHA512, SHA3, AICH, ED2K, Tiger, DC++ TTH, BitTorrent BTIH, GOST R
+34.11-94, RIPEMD-160, HAS-160, EDON-R, Whirlpool and Snefru.")
+    (license (license:fsf-free "file://COPYING"))))
-- 
2.15.1

[bug#30390] [PATCH 2/3] gnu: libuv: Update to 1.19.1.

[Arun Isaac]

* gnu/packages/libevent.scm (libuv): Update to 1.19.1.
[arguments]: Use modify-phases.
---
 gnu/packages/libevent.scm | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm
index b613bf138..34b23d537 100644
--- a/gnu/packages/libevent.scm
+++ b/gnu/packages/libevent.scm
@@ -121,24 +121,24 @@ limited support for fork events.")
 (define-public libuv
   (package
     (name "libuv")
-    (version "1.14.1")
+    (version "1.19.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://dist.libuv.org/dist/v" version
                                   "/libuv-v" version ".tar.gz"))
               (sha256
                (base32
-                "08kx4mzjsdv90n9pivqxqjxlxk5vaf9p33zzvx661dwfmp9468pk"))))
+                "0y78029vhfhjwpbwg9c0p8ih8489azpfa9sjnzj2bksf6r29kv9j"))))
     (build-system gnu-build-system)
     (arguments
-     '(#:phases (alist-cons-after
-                 'unpack 'autogen
-                 (lambda _
-                   ;; Fashionable people don't run 'make dist' these days, so
-                   ;; we need to do that ourselves.
-                   (zero? (system* "sh" "autogen.sh")))
-                 %standard-phases)
-
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'autogen
+           (lambda _
+             ;; Fashionable people don't run 'make dist' these days, so
+             ;; we need to do that ourselves.
+             (invoke "./autogen.sh")
+             #t)))
        ;; XXX: Some tests want /dev/tty, attempt to make connections, etc.
        #:tests? #f))
     (native-inputs `(("autoconf" ,(autoconf-wrapper))
-- 
2.15.1

[bug#30390] [PATCH 2/3] gnu: libuv: Update to 1.19.1.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 204 bytes --]

Arun Isaac <arunisaac@systemreboot.net> writes:

> * gnu/packages/libevent.scm (libuv): Update to 1.19.1.
> [arguments]: Use modify-phases.

This is already in core-updates, sorry for the duplicate work!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

[bug#30390] [PATCH 3/3] gnu: cmake: Update to 3.10.2.

[Arun Isaac]

* gnu/packages/cmake.scm (cmake): Update to 3.10.2. Re-indent.
[source]: Remove cmake-fix-tests patch.
Do not remove bundled cmlibuv.
[arguments]: Replace system* with invoke.
[inputs]: Add rhash. Sort.
[home-page]: Update URL.
* gnu/packages/patches/cmake-fix-tests.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Unregister it.
---
 gnu/local.mk                               |   1 -
 gnu/packages/cmake.scm                     | 153 ++++++++++++++++-------------
 gnu/packages/patches/cmake-fix-tests.patch | 120 ----------------------
 3 files changed, 83 insertions(+), 191 deletions(-)
 delete mode 100644 gnu/packages/patches/cmake-fix-tests.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 3f0023a2f..94803a39f 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -583,7 +583,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/clisp-remove-failing-test.patch		\
   %D%/packages/patches/clucene-pkgconfig.patch			\
   %D%/packages/patches/clx-remove-demo.patch			\
-  %D%/packages/patches/cmake-fix-tests.patch			\
   %D%/packages/patches/coda-use-system-libs.patch		\
   %D%/packages/patches/cool-retro-term-dont-check-uninit-member.patch	\
   %D%/packages/patches/cool-retro-term-fix-array-size.patch	\
diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm
index a4e2d38e3..cbe1ed701 100644
--- a/gnu/packages/cmake.scm
+++ b/gnu/packages/cmake.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
 ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -31,6 +32,7 @@
   #:use-module (gnu packages)
   #:use-module (gnu packages backup)
   #:use-module (gnu packages compression)
+  #:use-module (gnu packages crypto)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages file)
   #:use-module (gnu packages libevent)
@@ -40,57 +42,65 @@
 (define-public cmake
   (package
     (name "cmake")
-    (version "3.7.2")
+    (version "3.10.2")
     (source (origin
-             (method url-fetch)
-             (uri (string-append "https://www.cmake.org/files/v"
-                                 (version-major+minor version)
-                                 "/cmake-" version ".tar.gz"))
-             (sha256
-              (base32
-               "1q6a60695prpzzsmczm2xrgxdb61fyjznb04dr6yls6iwv24c4nw"))
-             (patches (search-patches "cmake-fix-tests.patch"))
-             (modules '((guix build utils)))
-             (snippet
-              '(begin
-                 ;; Drop bundled software.
-                 (with-directory-excursion "Utilities"
-                   (for-each delete-file-recursively
-                             '("cmbzip2"
-                               ;"cmcompress"
-                               "cmcurl"
-                               "cmexpat"
-                               ;"cmjsoncpp"
-                               ;"cmlibarchive"
-                               "cmliblzma"
-                               "cmlibuv"
-                               "cmzlib"))
-                   #t)))))
+              (method url-fetch)
+              (uri (string-append "https://www.cmake.org/files/v"
+                                  (version-major+minor version)
+                                  "/cmake-" version ".tar.gz"))
+              (sha256
+               (base32
+                "12r1ldq4l032d6f5gc22dlayck4cr29cczqsl9xf0vdm9anzml40"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin
+                  ;; Drop bundled software.
+                  (with-directory-excursion "Utilities"
+                    (for-each delete-file-recursively
+                              '("cmbzip2"
+                                ;; "cmcompress"
+                                "cmcurl"
+                                "cmexpat"
+                                ;; "cmjsoncpp"
+                                ;; "cmlibarchive"
+                                "cmliblzma"
+                                ;; "cmlibuv"
+                                "cmzlib"))
+                    #t)))))
     (build-system gnu-build-system)
     (arguments
      `(#:test-target "test"
+       #:make-flags
+       (let ((skipped-tests
+              (list "CTestTestUpload" ; This test requires network access.
+                    ;; These tests fail.
+                    "CTestTestSubdir"
+                    "CMake.String"
+                    "CTestCoverageCollectGCOV"
+                    "BundleUtilities")))
+         (list
+          (string-append
+           "ARGS=--exclude-regex ^\\(" (string-join skipped-tests "\\|") "\\)$")))
        #:phases
        (modify-phases %standard-phases
          (add-before 'configure 'patch-bin-sh
            (lambda _
-           ;; Replace "/bin/sh" by the right path in... a lot of
-           ;; files.
-           (substitute*
-               '("Modules/CompilerId/Xcode-3.pbxproj.in"
-                 "Modules/CompilerId/Xcode-1.pbxproj.in"
-                 "Modules/CompilerId/Xcode-2.pbxproj.in"
-                 "Modules/CPack.RuntimeScript.in"
-                 "Source/cmakexbuild.cxx"
-                 "Source/cmGlobalXCodeGenerator.cxx"
-                 "Source/CTest/cmCTestBatchTestHandler.cxx"
-                 "Source/cmLocalUnixMakefileGenerator3.cxx"
-                 "Source/cmExecProgramCommand.cxx"
-                 "Utilities/Release/release_cmake.cmake"
-                 "Utilities/cmlibarchive/libarchive/archive_write_set_format_shar.c"
-                 "Tests/CMakeLists.txt"
-                 "Tests/RunCMake/File_Generate/RunCMakeTest.cmake")
+             ;; Replace "/bin/sh" by the right path in... a lot of
+             ;; files.
+             (substitute*
+                 '("Modules/CompilerId/Xcode-3.pbxproj.in"
+                   "Modules/CPack.RuntimeScript.in"
+                   "Source/cmakexbuild.cxx"
+                   "Source/cmGlobalXCodeGenerator.cxx"
+                   "Source/CTest/cmCTestBatchTestHandler.cxx"
+                   "Source/cmLocalUnixMakefileGenerator3.cxx"
+                   "Source/cmExecProgramCommand.cxx"
+                   "Utilities/Release/release_cmake.cmake"
+                   "Utilities/cmlibarchive/libarchive/archive_write_set_format_shar.c"
+                   "Tests/CMakeLists.txt"
+                   "Tests/RunCMake/File_Generate/RunCMakeTest.cmake")
                (("/bin/sh") (which "sh")))
-           #t))
+             #t))
          (add-before 'configure 'set-paths
            (lambda _
              ;; Help cmake's bootstrap process to find system libraries
@@ -101,43 +111,46 @@
          (replace 'configure
            (lambda* (#:key outputs #:allow-other-keys)
              (let ((out (assoc-ref outputs "out")))
-               (zero? (system*
-                       "./configure"
-                       (string-append "--prefix=" out)
-                       "--system-libs"
-                       "--no-system-jsoncpp" ; FIXME: Circular dependency.
-                       ;; By default, the man pages and other docs land
-                       ;; in PREFIX/man and PREFIX/doc, but we want them
-                       ;; in share/{man,doc}.  Note that unlike
-                       ;; autoconf-generated configure scripts, cmake's
-                       ;; configure prepends "PREFIX/" to what we pass
-                       ;; to --mandir and --docdir.
-                       "--mandir=share/man"
-                       ,(string-append
-                         "--docdir=share/doc/cmake-"
-                         (version-major+minor version)))))))
+               (invoke
+                "./configure"
+                (string-append "--prefix=" out)
+                "--system-libs"
+                "--no-system-jsoncpp" ; FIXME: Circular dependency.
+                ;; By default, the man pages and other docs land
+                ;; in PREFIX/man and PREFIX/doc, but we want them
+                ;; in share/{man,doc}.  Note that unlike
+                ;; autoconf-generated configure scripts, cmake's
+                ;; configure prepends "PREFIX/" to what we pass
+                ;; to --mandir and --docdir.
+                "--mandir=share/man"
+                ,(string-append
+                  "--docdir=share/doc/cmake-"
+                  (version-major+minor version)))
+               #t)))
          (add-before 'check 'set-test-environment
            (lambda _
              ;; Get verbose output from failed tests.
              (setenv "CTEST_OUTPUT_ON_FAILURE" "TRUE")
+             ;; Parallel tests fail in the 3.10.2 release.
              ;; Run tests in parallel.
-             (setenv "CTEST_PARALLEL_LEVEL"
-                     (number->string (parallel-job-count)))
+             ;; (setenv "CTEST_PARALLEL_LEVEL"
+             ;;         (number->string (parallel-job-count)))
              #t)))))
     (inputs
-     `(("file"       ,file)
-       ("curl"       ,curl)
-       ("zlib"       ,zlib)
-       ("expat"      ,expat)
-       ("bzip2"      ,bzip2)
-       ("ncurses"    ,ncurses) ; required for ccmake
-       ("libuv"      ,libuv)
-       ("libarchive" ,libarchive)))
+     `(("bzip2" ,bzip2)
+       ("curl" ,curl)
+       ("expat" ,expat)
+       ("file" ,file)
+       ("libarchive" ,libarchive)
+       ("libuv" ,libuv)
+       ("ncurses" ,ncurses) ; required for ccmake
+       ("rhash" ,rhash)
+       ("zlib" ,zlib)))
     (native-search-paths
      (list (search-path-specification
-             (variable "CMAKE_PREFIX_PATH")
-             (files '("")))))
-    (home-page "https://www.cmake.org/")
+            (variable "CMAKE_PREFIX_PATH")
+            (files '("")))))
+    (home-page "https://cmake.org/")
     (synopsis "Cross-platform build system")
     (description
      "CMake is a family of tools designed to build, test and package software.
diff --git a/gnu/packages/patches/cmake-fix-tests.patch b/gnu/packages/patches/cmake-fix-tests.patch
deleted file mode 100644
index 732b0023a..000000000
--- a/gnu/packages/patches/cmake-fix-tests.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From af0a62dadfb3db25880bc653e2e4c97435a604c9 Mon Sep 17 00:00:00 2001
-From: Efraim Flashner <efraim@flashner.co.il>
-Date: Mon, 29 Aug 2016 20:07:58 +0300
-Subject: [PATCH] cmake-fix-tests
-
----
- Tests/CMakeLists.txt | 83 ++++++++++++++++++++++++++++------------------------
- 1 file changed, 44 insertions(+), 39 deletions(-)
-
-diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
-index f21e430..56014a2 100644
---- a/Tests/CMakeLists.txt
-+++ b/Tests/CMakeLists.txt
-@@ -416,10 +416,12 @@ if(BUILD_TESTING)
-   endif()
- 
-   # run test for BundleUtilities on supported platforms/compilers
--  if(MSVC OR
--     MINGW OR
--     CMAKE_SYSTEM_NAME MATCHES "Linux" OR
--     CMAKE_SYSTEM_NAME MATCHES "Darwin")
-+#  if(MSVC OR
-+#     MINGW OR
-+#     CMAKE_SYSTEM_NAME MATCHES "Linux" OR
-+#     CMAKE_SYSTEM_NAME MATCHES "Darwin")
-+# This test fails on Guix: skip it.
-+  if(FALSE)
-   if(NOT "${CMAKE_GENERATOR}" STREQUAL "Watcom WMake")
- 
-     add_test(BundleUtilities ${CMAKE_CTEST_COMMAND}
-@@ -2481,30 +2483,32 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
-     PASS_REGULAR_EXPRESSION "Could not find executable"
-     FAIL_REGULAR_EXPRESSION "SegFault")
- 
--  configure_file(
--    "${CMake_SOURCE_DIR}/Tests/CTestTestUpload/test.cmake.in"
--    "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake"
--    @ONLY ESCAPE_QUOTES)
--  add_test(CTestTestUpload ${CMAKE_CTEST_COMMAND}
--    -S "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake" -V
--    --output-log "${CMake_BINARY_DIR}/Tests/CTestTestUpload/testOut.log"
--    )
--  set_tests_properties(CTestTestUpload PROPERTIES
--    PASS_REGULAR_EXPRESSION "Upload\\.xml")
--
--  configure_file(
--    "${CMake_SOURCE_DIR}/Tests/CTestCoverageCollectGCOV/test.cmake.in"
--    "${CMake_BINARY_DIR}/Tests/CTestCoverageCollectGCOV/test.cmake"
--    @ONLY ESCAPE_QUOTES)
--  add_test(CTestCoverageCollectGCOV ${CMAKE_CTEST_COMMAND}
--    -C \${CTEST_CONFIGURATION_TYPE}
--    -S "${CMake_BINARY_DIR}/Tests/CTestCoverageCollectGCOV/test.cmake" -VV
--    --output-log "${CMake_BINARY_DIR}/Tests/CTestCoverageCollectGCOV/testOut.log"
--    )
--  set_tests_properties(CTestCoverageCollectGCOV PROPERTIES
--    PASS_REGULAR_EXPRESSION
--    "PASSED with correct output.*Testing/CoverageInfo/main.cpp.gcov")
--  set_property(TEST CTestCoverageCollectGCOV PROPERTY ENVIRONMENT CTEST_PARALLEL_LEVEL=)
-+# This test requires network connectivity: skip it.
-+#  configure_file(
-+#    "${CMake_SOURCE_DIR}/Tests/CTestTestUpload/test.cmake.in"
-+#    "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake"
-+#    @ONLY ESCAPE_QUOTES)
-+#  add_test(CTestTestUpload ${CMAKE_CTEST_COMMAND}
-+#    -S "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake" -V
-+#    --output-log "${CMake_BINARY_DIR}/Tests/CTestTestUpload/testOut.log"
-+#    )
-+#  set_tests_properties(CTestTestUpload PROPERTIES
-+#    PASS_REGULAR_EXPRESSION "Upload\\.xml")
-+
-+# This test times out
-+#  configure_file(
-+#    "${CMake_SOURCE_DIR}/Tests/CTestCoverageCollectGCOV/test.cmake.in"
-+#    "${CMake_BINARY_DIR}/Tests/CTestCoverageCollectGCOV/test.cmake"
-+#    @ONLY ESCAPE_QUOTES)
-+#  add_test(CTestCoverageCollectGCOV ${CMAKE_CTEST_COMMAND}
-+#    -C \${CTEST_CONFIGURATION_TYPE}
-+#    -S "${CMake_BINARY_DIR}/Tests/CTestCoverageCollectGCOV/test.cmake" -VV
-+#    --output-log "${CMake_BINARY_DIR}/Tests/CTestCoverageCollectGCOV/testOut.log"
-+#    )
-+#  set_tests_properties(CTestCoverageCollectGCOV PROPERTIES
-+#    PASS_REGULAR_EXPRESSION
-+#    "PASSED with correct output.*Testing/CoverageInfo/main.cpp.gcov")
-+#  set_property(TEST CTestCoverageCollectGCOV PROPERTY ENVIRONMENT CTEST_PARALLEL_LEVEL=)
- 
-   configure_file(
-     "${CMake_SOURCE_DIR}/Tests/CTestTestEmptyBinaryDirectory/test.cmake.in"
-@@ -2860,17 +2864,18 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
-   set_tests_properties(CTestTestStopTime PROPERTIES
-     PASS_REGULAR_EXPRESSION "The stop time has been passed")
- 
--  configure_file(
--    "${CMake_SOURCE_DIR}/Tests/CTestTestSubdir/test.cmake.in"
--    "${CMake_BINARY_DIR}/Tests/CTestTestSubdir/test.cmake"
--    @ONLY ESCAPE_QUOTES)
--  add_test(CTestTestSubdir ${CMAKE_CTEST_COMMAND}
--    -S "${CMake_BINARY_DIR}/Tests/CTestTestSubdir/test.cmake" -V
--    --output-log "${CMake_BINARY_DIR}/Tests/CTestTestSubdir/testOutput.log"
--    )
--  #make sure all 3 subdirs were added
--  set_tests_properties(CTestTestSubdir PROPERTIES
--    PASS_REGULAR_EXPRESSION "0 tests failed out of 3")
-+# This test fails to build 2 of the 3 tests
-+#  configure_file(
-+#    "${CMake_SOURCE_DIR}/Tests/CTestTestSubdir/test.cmake.in"
-+#    "${CMake_BINARY_DIR}/Tests/CTestTestSubdir/test.cmake"
-+#    @ONLY ESCAPE_QUOTES)
-+#  add_test(CTestTestSubdir ${CMAKE_CTEST_COMMAND}
-+#    -S "${CMake_BINARY_DIR}/Tests/CTestTestSubdir/test.cmake" -V
-+#    --output-log "${CMake_BINARY_DIR}/Tests/CTestTestSubdir/testOutput.log"
-+#    )
-+#  #make sure all 3 subdirs were added
-+#  set_tests_properties(CTestTestSubdir PROPERTIES
-+#    PASS_REGULAR_EXPRESSION "0 tests failed out of 3")
- 
-   configure_file(
-     "${CMake_SOURCE_DIR}/Tests/CTestTestTimeout/test.cmake.in"
--- 
-2.9.3
-
-- 
2.15.1

[bug#30390] [PATCH 3/3] gnu: cmake: Update to 3.10.2.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 3853 bytes --]

Arun Isaac <arunisaac@systemreboot.net> writes:

> * gnu/packages/cmake.scm (cmake): Update to 3.10.2. Re-indent.
> [source]: Remove cmake-fix-tests patch.
> Do not remove bundled cmlibuv.
> [arguments]: Replace system* with invoke.
> [inputs]: Add rhash. Sort.
> [home-page]: Update URL.
> * gnu/packages/patches/cmake-fix-tests.patch: Delete file.
> * gnu/local.mk (dist_patch_DATA): Unregister it.

[...]

> @@ -31,6 +32,7 @@
>    #:use-module (gnu packages)
>    #:use-module (gnu packages backup)
>    #:use-module (gnu packages compression)
> +  #:use-module (gnu packages crypto)
>    #:use-module (gnu packages curl)
>    #:use-module (gnu packages file)
>    #:use-module (gnu packages libevent)
> @@ -40,57 +42,65 @@
>  (define-public cmake
>    (package
>      (name "cmake")
> -    (version "3.7.2")
> +    (version "3.10.2")
>      (source (origin
> -             (method url-fetch)
> -             (uri (string-append "https://www.cmake.org/files/v"
> -                                 (version-major+minor version)
> -                                 "/cmake-" version ".tar.gz"))
> -             (sha256
> -              (base32
> -               "1q6a60695prpzzsmczm2xrgxdb61fyjznb04dr6yls6iwv24c4nw"))
> -             (patches (search-patches "cmake-fix-tests.patch"))
> -             (modules '((guix build utils)))
> -             (snippet
> -              '(begin
> -                 ;; Drop bundled software.
> -                 (with-directory-excursion "Utilities"
> -                   (for-each delete-file-recursively
> -                             '("cmbzip2"
> -                               ;"cmcompress"
> -                               "cmcurl"
> -                               "cmexpat"
> -                               ;"cmjsoncpp"
> -                               ;"cmlibarchive"
> -                               "cmliblzma"
> -                               "cmlibuv"
> -                               "cmzlib"))
> -                   #t)))))
> +              (method url-fetch)
> +              (uri (string-append "https://www.cmake.org/files/v"
> +                                  (version-major+minor version)
> +                                  "/cmake-" version ".tar.gz"))
> +              (sha256
> +               (base32
> +                "12r1ldq4l032d6f5gc22dlayck4cr29cczqsl9xf0vdm9anzml40"))
> +              (modules '((guix build utils)))
> +              (snippet
> +               '(begin
> +                  ;; Drop bundled software.
> +                  (with-directory-excursion "Utilities"
> +                    (for-each delete-file-recursively
> +                              '("cmbzip2"
> +                                ;; "cmcompress"
> +                                "cmcurl"
> +                                "cmexpat"
> +                                ;; "cmjsoncpp"
> +                                ;; "cmlibarchive"
> +                                "cmliblzma"
> +                                ;; "cmlibuv"
> +                                "cmzlib"))
> +                    #t)))))
>      (build-system gnu-build-system)
>      (arguments
>       `(#:test-target "test"
> +       #:make-flags
> +       (let ((skipped-tests
> +              (list "CTestTestUpload" ; This test requires network access.
> +                    ;; These tests fail.
> +                    "CTestTestSubdir"
> +                    "CMake.String"
> +                    "CTestCoverageCollectGCOV"
> +                    "BundleUtilities")))

Please transfer the comments about the test failures from
"cmake-fix-tests.patch" to this section.  Other than that this is OK for
core-updates.

Side note: I'd prefer to have the indendation change in a separate
commit, since it's very difficult to read this diff.  But I understand
that it would be a hassle to change it now, so OK. :-)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

[bug#30390] [PATCH 1/3] gnu: Add rhash.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 2667 bytes --]

Arun Isaac <arunisaac@systemreboot.net> writes:

> * gnu/packages/crypto.scm (rhash): New variable.

[...]

> +(define-public rhash
> +  (package
> +    (name "rhash")
> +    (version "1.3.5")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append "https://github.com/rhash/RHash/archive/v"
> +                           version ".tar.gz"))
> +       (file-name (string-append name "-" version ".tar.gz"))
> +       (sha256
> +        (base32
> +         "0bhz3xdl6r06k1bqigdjz42l31iqz2qdpg7zk316i7p2ra56iq4q"))))
> +    (build-system gnu-build-system)
> +    (arguments
> +     `(#:make-flags (list "CC=gcc"
> +                          (string-append "PREFIX=" %output))
> +       #:test-target "test"
> +       #:phases
> +       (modify-phases %standard-phases
> +         (replace 'configure
> +           (lambda* (#:key outputs #:allow-other-keys)
> +             (substitute* "Makefile"
> +               (("\\$\\(DESTDIR\\)/etc")
> +                (string-append (assoc-ref outputs "out") "/etc")))
> +             #t))
> +         (add-after 'build 'build-library
> +           (lambda* (#:key outputs make-flags #:allow-other-keys)
> +             (apply invoke "make" "lib-shared" make-flags)
> +             #t))
> +         (add-after 'install 'install-library
> +           (lambda* (#:key outputs make-flags #:allow-other-keys)
> +             (apply invoke "make" "install-lib-shared" make-flags)
> +             (apply invoke
> +                    "make" "-C" "librhash" "install-headers"
> +                    "install-so-link" make-flags)
> +             #t))
> +         (add-after 'check 'check-library
> +           (lambda* (#:key outputs make-flags #:allow-other-keys)
> +             (apply invoke "make" "test-shared-lib" make-flags)
> +             #t)))))

I think the "outputs" key is unnecessary in all these phases.

Also, (invoke ...) returns #t on successful execution, so no need to add
an extra #t at the end.

> +    (home-page "https://sourceforge.net/projects/rhash/")
> +    (synopsis "Utility for computing hash sums")
> +    (description "RHash is a console utility for calculation and verification
> +of magnet links and a wide range of hash sums like CRC32, MD4, MD5, SHA1,
> +SHA256, SHA512, SHA3, AICH, ED2K, Tiger, DC++ TTH, BitTorrent BTIH, GOST R
> +34.11-94, RIPEMD-160, HAS-160, EDON-R, Whirlpool and Snefru.")
> +    (license (license:fsf-free "file://COPYING"))))

Has this license been approved by the FSF?  If so please add a URL.
Otherwise I'd go with "non-copyleft" here.

Otherwise this LGTM.  I guess this can go to "master" in case it's
needed before the CMake update.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

[bug#30390] [PATCH 1/3] gnu: Add rhash.

[Arun Isaac]

Marius Bakke <mbakke@fastmail.com> writes:

> Arun Isaac <arunisaac@systemreboot.net> writes:
>
>> * gnu/packages/crypto.scm (rhash): New variable.
>
> I guess this can go to "master" in case it's needed before the CMake
> update.

I'll make the changes and push rhash to master.

I'm building the other packages, but it's taking a while. So, do bear
with me. No problem about the cmake reindent. I'll separate it out as a
different patch.

Also, it looks like the sqlite package is broken. Upstream has changed
the source URL from
https://sqlite.org/2017/sqlite-autoconf-3220000.tar.gz to
https://sqlite.org/2018/sqlite-autoconf-3220000.tar.gz
Notice the change in the year: 2017 -> 2018. I'll send a patch for this
as well.

[bug#30390] [PATCH 1/3] gnu: Add rhash.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 904 bytes --]

Arun Isaac <arunisaac@systemreboot.net> writes:

> Marius Bakke <mbakke@fastmail.com> writes:
>
>> Arun Isaac <arunisaac@systemreboot.net> writes:
>>
>>> * gnu/packages/crypto.scm (rhash): New variable.
>>
>> I guess this can go to "master" in case it's needed before the CMake
>> update.
>
> I'll make the changes and push rhash to master.

Excellent.

>
> I'm building the other packages, but it's taking a while. So, do bear
> with me. No problem about the cmake reindent. I'll separate it out as a
> different patch.

Great, thank you!

> Also, it looks like the sqlite package is broken. Upstream has changed
> the source URL from
> https://sqlite.org/2017/sqlite-autoconf-3220000.tar.gz to
> https://sqlite.org/2018/sqlite-autoconf-3220000.tar.gz
> Notice the change in the year: 2017 -> 2018. I'll send a patch for this
> as well.

Oops, not sure how I missed that.  Thanks for taking care of it.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

[bug#30390] [PATCH 0/3] Update cmake.

[Arun Isaac]

I have added rhash and pushed it to master. Unfortunately, it became two
commits, instead of just one, due to my sloppiness.

All other changes you mentioned are done. Please find below the new patches.

Test 92 of tar 1.30 fails on my system. I had to disable tar tests to get my
cmake to build. I am not entirely sure if the test failure has got something
to do with insufficient memory on my system. So, I'd like somebody to
reproduce the problem before patching it.

I'm a little confused now. Shouldn't I rebase the core-updates branch against
master in order to have rhash? Wouldn't this disrupt the evaluation of
core-updates on the build farm? Sorry I'm not very clear about how we handle
core-updates.

Arun Isaac (3):
  gnu: sqlite: Fix source URI.
  gnu: cmake: Update to 3.10.2.
  gnu: cmake: Re-indent.

 gnu/local.mk                               |   1 -
 gnu/packages/cmake.scm                     | 154 ++++++++++++++++-------------
 gnu/packages/databases.scm                 |   2 +-
 gnu/packages/patches/cmake-fix-tests.patch | 120 ----------------------
 4 files changed, 85 insertions(+), 192 deletions(-)
 delete mode 100644 gnu/packages/patches/cmake-fix-tests.patch

-- 
2.15.1

[bug#30390] [PATCH 1/3] gnu: sqlite: Fix source URI.

[Arun Isaac]

* gnu/packages/databases.scm (sqlite)[source]: Fix source URI.
---
 gnu/packages/databases.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index d14fb6744..51e18d4a6 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -1004,7 +1004,7 @@ for example from a shell script.")
                                             (map (cut string-pad <> 2 #\0)
                                                  other-digits))
                                            6 #\0))))))
-                   (string-append "https://sqlite.org/2017/sqlite-autoconf-"
+                   (string-append "https://sqlite.org/2018/sqlite-autoconf-"
                                   numeric-version ".tar.gz")))
             (sha256
              (base32
-- 
2.15.1

[bug#30390] [PATCH 2/3] gnu: cmake: Update to 3.10.2.

[Arun Isaac]

* gnu/packages/cmake.scm (cmake): Update to 3.10.2.
[source]: Remove cmake-fix-tests patch.
Do not remove bundled cmlibuv.
[arguments]: Replace system* with invoke.
[inputs]: Add rhash. Sort.
[home-page]: Update URL.
* gnu/packages/patches/cmake-fix-tests.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Unregister it.
---
 gnu/local.mk                               |   1 -
 gnu/packages/cmake.scm                     |  88 ++++++++++++---------
 gnu/packages/patches/cmake-fix-tests.patch | 120 -----------------------------
 3 files changed, 51 insertions(+), 158 deletions(-)
 delete mode 100644 gnu/packages/patches/cmake-fix-tests.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 82ae783db..d597d41f9 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -588,7 +588,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/clisp-remove-failing-test.patch		\
   %D%/packages/patches/clucene-pkgconfig.patch			\
   %D%/packages/patches/clx-remove-demo.patch			\
-  %D%/packages/patches/cmake-fix-tests.patch			\
   %D%/packages/patches/coda-use-system-libs.patch		\
   %D%/packages/patches/cool-retro-term-dont-check-uninit-member.patch	\
   %D%/packages/patches/cool-retro-term-fix-array-size.patch	\
diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm
index a4e2d38e3..3f254b6f8 100644
--- a/gnu/packages/cmake.scm
+++ b/gnu/packages/cmake.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
 ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -31,6 +32,7 @@
   #:use-module (gnu packages)
   #:use-module (gnu packages backup)
   #:use-module (gnu packages compression)
+  #:use-module (gnu packages crypto)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages file)
   #:use-module (gnu packages libevent)
@@ -40,7 +42,7 @@
 (define-public cmake
   (package
     (name "cmake")
-    (version "3.7.2")
+    (version "3.10.2")
     (source (origin
              (method url-fetch)
              (uri (string-append "https://www.cmake.org/files/v"
@@ -48,8 +50,7 @@
                                  "/cmake-" version ".tar.gz"))
              (sha256
               (base32
-               "1q6a60695prpzzsmczm2xrgxdb61fyjznb04dr6yls6iwv24c4nw"))
-             (patches (search-patches "cmake-fix-tests.patch"))
+               "12r1ldq4l032d6f5gc22dlayck4cr29cczqsl9xf0vdm9anzml40"))
              (modules '((guix build utils)))
              (snippet
               '(begin
@@ -57,18 +58,31 @@
                  (with-directory-excursion "Utilities"
                    (for-each delete-file-recursively
                              '("cmbzip2"
-                               ;"cmcompress"
+                               ;; "cmcompress"
                                "cmcurl"
                                "cmexpat"
-                               ;"cmjsoncpp"
-                               ;"cmlibarchive"
+                               ;; "cmjsoncpp"
+                               ;; "cmlibarchive"
                                "cmliblzma"
-                               "cmlibuv"
+                               ;; "cmlibuv"
                                "cmzlib"))
                    #t)))))
     (build-system gnu-build-system)
     (arguments
      `(#:test-target "test"
+       #:make-flags
+       (let ((skipped-tests
+              (list "BundleUtilities" ; This test fails on Guix.
+                    "CTestTestSubdir" ; This test fails to build 2 of the 3 tests.
+                    "CMake.String" ; This test depends on clock being set to
+                                   ; current time, which is not the case in
+                                   ; the build environment.
+                    ;; These tests requires network access.
+                    "CTestCoverageCollectGCOV"
+                    "CTestTestUpload")))
+         (list
+          (string-append
+           "ARGS=--exclude-regex ^\\(" (string-join skipped-tests "\\|") "\\)$")))
        #:phases
        (modify-phases %standard-phases
          (add-before 'configure 'patch-bin-sh
@@ -77,8 +91,6 @@
            ;; files.
            (substitute*
                '("Modules/CompilerId/Xcode-3.pbxproj.in"
-                 "Modules/CompilerId/Xcode-1.pbxproj.in"
-                 "Modules/CompilerId/Xcode-2.pbxproj.in"
                  "Modules/CPack.RuntimeScript.in"
                  "Source/cmakexbuild.cxx"
                  "Source/cmGlobalXCodeGenerator.cxx"
@@ -101,43 +113,45 @@
          (replace 'configure
            (lambda* (#:key outputs #:allow-other-keys)
              (let ((out (assoc-ref outputs "out")))
-               (zero? (system*
-                       "./configure"
-                       (string-append "--prefix=" out)
-                       "--system-libs"
-                       "--no-system-jsoncpp" ; FIXME: Circular dependency.
-                       ;; By default, the man pages and other docs land
-                       ;; in PREFIX/man and PREFIX/doc, but we want them
-                       ;; in share/{man,doc}.  Note that unlike
-                       ;; autoconf-generated configure scripts, cmake's
-                       ;; configure prepends "PREFIX/" to what we pass
-                       ;; to --mandir and --docdir.
-                       "--mandir=share/man"
-                       ,(string-append
-                         "--docdir=share/doc/cmake-"
-                         (version-major+minor version)))))))
+               (invoke
+                "./configure"
+                (string-append "--prefix=" out)
+                "--system-libs"
+                "--no-system-jsoncpp" ; FIXME: Circular dependency.
+                ;; By default, the man pages and other docs land
+                ;; in PREFIX/man and PREFIX/doc, but we want them
+                ;; in share/{man,doc}.  Note that unlike
+                ;; autoconf-generated configure scripts, cmake's
+                ;; configure prepends "PREFIX/" to what we pass
+                ;; to --mandir and --docdir.
+                "--mandir=share/man"
+                ,(string-append
+                  "--docdir=share/doc/cmake-"
+                  (version-major+minor version))))))
          (add-before 'check 'set-test-environment
            (lambda _
              ;; Get verbose output from failed tests.
              (setenv "CTEST_OUTPUT_ON_FAILURE" "TRUE")
+             ;; Parallel tests fail in the 3.10.2 release.
              ;; Run tests in parallel.
-             (setenv "CTEST_PARALLEL_LEVEL"
-                     (number->string (parallel-job-count)))
+             ;; (setenv "CTEST_PARALLEL_LEVEL"
+             ;;         (number->string (parallel-job-count)))
              #t)))))
     (inputs
-     `(("file"       ,file)
-       ("curl"       ,curl)
-       ("zlib"       ,zlib)
-       ("expat"      ,expat)
-       ("bzip2"      ,bzip2)
-       ("ncurses"    ,ncurses) ; required for ccmake
-       ("libuv"      ,libuv)
-       ("libarchive" ,libarchive)))
+     `(("bzip2" ,bzip2)
+       ("curl" ,curl)
+       ("expat" ,expat)
+       ("file" ,file)
+       ("libarchive" ,libarchive)
+       ("libuv" ,libuv)
+       ("ncurses" ,ncurses) ; required for ccmake
+       ("rhash" ,rhash)
+       ("zlib" ,zlib)))
     (native-search-paths
      (list (search-path-specification
-             (variable "CMAKE_PREFIX_PATH")
-             (files '("")))))
-    (home-page "https://www.cmake.org/")
+            (variable "CMAKE_PREFIX_PATH")
+            (files '("")))))
+    (home-page "https://cmake.org/")
     (synopsis "Cross-platform build system")
     (description
      "CMake is a family of tools designed to build, test and package software.
diff --git a/gnu/packages/patches/cmake-fix-tests.patch b/gnu/packages/patches/cmake-fix-tests.patch
deleted file mode 100644
index 732b0023a..000000000
--- a/gnu/packages/patches/cmake-fix-tests.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From af0a62dadfb3db25880bc653e2e4c97435a604c9 Mon Sep 17 00:00:00 2001
-From: Efraim Flashner <efraim@flashner.co.il>
-Date: Mon, 29 Aug 2016 20:07:58 +0300
-Subject: [PATCH] cmake-fix-tests
-
----
- Tests/CMakeLists.txt | 83 ++++++++++++++++++++++++++++------------------------
- 1 file changed, 44 insertions(+), 39 deletions(-)
-
-diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
-index f21e430..56014a2 100644
---- a/Tests/CMakeLists.txt
-+++ b/Tests/CMakeLists.txt
-@@ -416,10 +416,12 @@ if(BUILD_TESTING)
-   endif()
- 
-   # run test for BundleUtilities on supported platforms/compilers
--  if(MSVC OR
--     MINGW OR
--     CMAKE_SYSTEM_NAME MATCHES "Linux" OR
--     CMAKE_SYSTEM_NAME MATCHES "Darwin")
-+#  if(MSVC OR
-+#     MINGW OR
-+#     CMAKE_SYSTEM_NAME MATCHES "Linux" OR
-+#     CMAKE_SYSTEM_NAME MATCHES "Darwin")
-+# This test fails on Guix: skip it.
-+  if(FALSE)
-   if(NOT "${CMAKE_GENERATOR}" STREQUAL "Watcom WMake")
- 
-     add_test(BundleUtilities ${CMAKE_CTEST_COMMAND}
-@@ -2481,30 +2483,32 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
-     PASS_REGULAR_EXPRESSION "Could not find executable"
-     FAIL_REGULAR_EXPRESSION "SegFault")
- 
--  configure_file(
--    "${CMake_SOURCE_DIR}/Tests/CTestTestUpload/test.cmake.in"
--    "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake"
--    @ONLY ESCAPE_QUOTES)
--  add_test(CTestTestUpload ${CMAKE_CTEST_COMMAND}
--    -S "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake" -V
--    --output-log "${CMake_BINARY_DIR}/Tests/CTestTestUpload/testOut.log"
--    )
--  set_tests_properties(CTestTestUpload PROPERTIES
--    PASS_REGULAR_EXPRESSION "Upload\\.xml")
--
--  configure_file(
--    "${CMake_SOURCE_DIR}/Tests/CTestCoverageCollectGCOV/test.cmake.in"
--    "${CMake_BINARY_DIR}/Tests/CTestCoverageCollectGCOV/test.cmake"
--    @ONLY ESCAPE_QUOTES)
--  add_test(CTestCoverageCollectGCOV ${CMAKE_CTEST_COMMAND}
--    -C \${CTEST_CONFIGURATION_TYPE}
--    -S "${CMake_BINARY_DIR}/Tests/CTestCoverageCollectGCOV/test.cmake" -VV
--    --output-log "${CMake_BINARY_DIR}/Tests/CTestCoverageCollectGCOV/testOut.log"
--    )
--  set_tests_properties(CTestCoverageCollectGCOV PROPERTIES
--    PASS_REGULAR_EXPRESSION
--    "PASSED with correct output.*Testing/CoverageInfo/main.cpp.gcov")
--  set_property(TEST CTestCoverageCollectGCOV PROPERTY ENVIRONMENT CTEST_PARALLEL_LEVEL=)
-+# This test requires network connectivity: skip it.
-+#  configure_file(
-+#    "${CMake_SOURCE_DIR}/Tests/CTestTestUpload/test.cmake.in"
-+#    "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake"
-+#    @ONLY ESCAPE_QUOTES)
-+#  add_test(CTestTestUpload ${CMAKE_CTEST_COMMAND}
-+#    -S "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake" -V
-+#    --output-log "${CMake_BINARY_DIR}/Tests/CTestTestUpload/testOut.log"
-+#    )
-+#  set_tests_properties(CTestTestUpload PROPERTIES
-+#    PASS_REGULAR_EXPRESSION "Upload\\.xml")
-+
-+# This test times out
-+#  configure_file(
-+#    "${CMake_SOURCE_DIR}/Tests/CTestCoverageCollectGCOV/test.cmake.in"
-+#    "${CMake_BINARY_DIR}/Tests/CTestCoverageCollectGCOV/test.cmake"
-+#    @ONLY ESCAPE_QUOTES)
-+#  add_test(CTestCoverageCollectGCOV ${CMAKE_CTEST_COMMAND}
-+#    -C \${CTEST_CONFIGURATION_TYPE}
-+#    -S "${CMake_BINARY_DIR}/Tests/CTestCoverageCollectGCOV/test.cmake" -VV
-+#    --output-log "${CMake_BINARY_DIR}/Tests/CTestCoverageCollectGCOV/testOut.log"
-+#    )
-+#  set_tests_properties(CTestCoverageCollectGCOV PROPERTIES
-+#    PASS_REGULAR_EXPRESSION
-+#    "PASSED with correct output.*Testing/CoverageInfo/main.cpp.gcov")
-+#  set_property(TEST CTestCoverageCollectGCOV PROPERTY ENVIRONMENT CTEST_PARALLEL_LEVEL=)
- 
-   configure_file(
-     "${CMake_SOURCE_DIR}/Tests/CTestTestEmptyBinaryDirectory/test.cmake.in"
-@@ -2860,17 +2864,18 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
-   set_tests_properties(CTestTestStopTime PROPERTIES
-     PASS_REGULAR_EXPRESSION "The stop time has been passed")
- 
--  configure_file(
--    "${CMake_SOURCE_DIR}/Tests/CTestTestSubdir/test.cmake.in"
--    "${CMake_BINARY_DIR}/Tests/CTestTestSubdir/test.cmake"
--    @ONLY ESCAPE_QUOTES)
--  add_test(CTestTestSubdir ${CMAKE_CTEST_COMMAND}
--    -S "${CMake_BINARY_DIR}/Tests/CTestTestSubdir/test.cmake" -V
--    --output-log "${CMake_BINARY_DIR}/Tests/CTestTestSubdir/testOutput.log"
--    )
--  #make sure all 3 subdirs were added
--  set_tests_properties(CTestTestSubdir PROPERTIES
--    PASS_REGULAR_EXPRESSION "0 tests failed out of 3")
-+# This test fails to build 2 of the 3 tests
-+#  configure_file(
-+#    "${CMake_SOURCE_DIR}/Tests/CTestTestSubdir/test.cmake.in"
-+#    "${CMake_BINARY_DIR}/Tests/CTestTestSubdir/test.cmake"
-+#    @ONLY ESCAPE_QUOTES)
-+#  add_test(CTestTestSubdir ${CMAKE_CTEST_COMMAND}
-+#    -S "${CMake_BINARY_DIR}/Tests/CTestTestSubdir/test.cmake" -V
-+#    --output-log "${CMake_BINARY_DIR}/Tests/CTestTestSubdir/testOutput.log"
-+#    )
-+#  #make sure all 3 subdirs were added
-+#  set_tests_properties(CTestTestSubdir PROPERTIES
-+#    PASS_REGULAR_EXPRESSION "0 tests failed out of 3")
- 
-   configure_file(
-     "${CMake_SOURCE_DIR}/Tests/CTestTestTimeout/test.cmake.in"
--- 
-2.9.3
-
-- 
2.15.1

[bug#30390] [PATCH 3/3] gnu: cmake: Re-indent.

[Arun Isaac]

* gnu/packages/cmake.scm (cmake): Re-indent.
---
 gnu/packages/cmake.scm | 80 +++++++++++++++++++++++++-------------------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm
index 3f254b6f8..549a87621 100644
--- a/gnu/packages/cmake.scm
+++ b/gnu/packages/cmake.scm
@@ -44,29 +44,29 @@
     (name "cmake")
     (version "3.10.2")
     (source (origin
-             (method url-fetch)
-             (uri (string-append "https://www.cmake.org/files/v"
-                                 (version-major+minor version)
-                                 "/cmake-" version ".tar.gz"))
-             (sha256
-              (base32
-               "12r1ldq4l032d6f5gc22dlayck4cr29cczqsl9xf0vdm9anzml40"))
-             (modules '((guix build utils)))
-             (snippet
-              '(begin
-                 ;; Drop bundled software.
-                 (with-directory-excursion "Utilities"
-                   (for-each delete-file-recursively
-                             '("cmbzip2"
-                               ;; "cmcompress"
-                               "cmcurl"
-                               "cmexpat"
-                               ;; "cmjsoncpp"
-                               ;; "cmlibarchive"
-                               "cmliblzma"
-                               ;; "cmlibuv"
-                               "cmzlib"))
-                   #t)))))
+              (method url-fetch)
+              (uri (string-append "https://www.cmake.org/files/v"
+                                  (version-major+minor version)
+                                  "/cmake-" version ".tar.gz"))
+              (sha256
+               (base32
+                "12r1ldq4l032d6f5gc22dlayck4cr29cczqsl9xf0vdm9anzml40"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin
+                  ;; Drop bundled software.
+                  (with-directory-excursion "Utilities"
+                    (for-each delete-file-recursively
+                              '("cmbzip2"
+                                ;; "cmcompress"
+                                "cmcurl"
+                                "cmexpat"
+                                ;; "cmjsoncpp"
+                                ;; "cmlibarchive"
+                                "cmliblzma"
+                                ;; "cmlibuv"
+                                "cmzlib"))
+                    #t)))))
     (build-system gnu-build-system)
     (arguments
      `(#:test-target "test"
@@ -75,8 +75,8 @@
               (list "BundleUtilities" ; This test fails on Guix.
                     "CTestTestSubdir" ; This test fails to build 2 of the 3 tests.
                     "CMake.String" ; This test depends on clock being set to
-                                   ; current time, which is not the case in
-                                   ; the build environment.
+                                        ; current time, which is not the case in
+                                        ; the build environment.
                     ;; These tests requires network access.
                     "CTestCoverageCollectGCOV"
                     "CTestTestUpload")))
@@ -87,22 +87,22 @@
        (modify-phases %standard-phases
          (add-before 'configure 'patch-bin-sh
            (lambda _
-           ;; Replace "/bin/sh" by the right path in... a lot of
-           ;; files.
-           (substitute*
-               '("Modules/CompilerId/Xcode-3.pbxproj.in"
-                 "Modules/CPack.RuntimeScript.in"
-                 "Source/cmakexbuild.cxx"
-                 "Source/cmGlobalXCodeGenerator.cxx"
-                 "Source/CTest/cmCTestBatchTestHandler.cxx"
-                 "Source/cmLocalUnixMakefileGenerator3.cxx"
-                 "Source/cmExecProgramCommand.cxx"
-                 "Utilities/Release/release_cmake.cmake"
-                 "Utilities/cmlibarchive/libarchive/archive_write_set_format_shar.c"
-                 "Tests/CMakeLists.txt"
-                 "Tests/RunCMake/File_Generate/RunCMakeTest.cmake")
+             ;; Replace "/bin/sh" by the right path in... a lot of
+             ;; files.
+             (substitute*
+                 '("Modules/CompilerId/Xcode-3.pbxproj.in"
+                   "Modules/CPack.RuntimeScript.in"
+                   "Source/cmakexbuild.cxx"
+                   "Source/cmGlobalXCodeGenerator.cxx"
+                   "Source/CTest/cmCTestBatchTestHandler.cxx"
+                   "Source/cmLocalUnixMakefileGenerator3.cxx"
+                   "Source/cmExecProgramCommand.cxx"
+                   "Utilities/Release/release_cmake.cmake"
+                   "Utilities/cmlibarchive/libarchive/archive_write_set_format_shar.c"
+                   "Tests/CMakeLists.txt"
+                   "Tests/RunCMake/File_Generate/RunCMakeTest.cmake")
                (("/bin/sh") (which "sh")))
-           #t))
+             #t))
          (add-before 'configure 'set-paths
            (lambda _
              ;; Help cmake's bootstrap process to find system libraries
-- 
2.15.1

[bug#30390] [PATCH 0/3] Update cmake.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 1033 bytes --]

Arun Isaac <arunisaac@systemreboot.net> writes:

> Test 92 of tar 1.30 fails on my system. I had to disable tar tests to get my
> cmake to build. I am not entirely sure if the test failure has got something
> to do with insufficient memory on my system. So, I'd like somebody to
> reproduce the problem before patching it.

That test fails on one of my build nodes with 64GB RAM as well.

There is a bug report about it upstream:
<https://lists.gnu.org/archive/html/bug-tar/2017-12/msg00026.html>.

However, the suggested fix does not work for me (I think it requires
running autoreconf, but haven't tried that yet).

> I'm a little confused now. Shouldn't I rebase the core-updates branch against
> master in order to have rhash? Wouldn't this disrupt the evaluation of
> core-updates on the build farm? Sorry I'm not very clear about how we handle
> core-updates.

We don't rebase 'live' branches.  The best way is to merge master, or
you could cherry-pick the patches.  I can merge it later if you're not
comfortable doing it :-)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

[bug#30390] [PATCH 0/3] Update cmake.

[Arun Isaac]

> We don't rebase 'live' branches.  The best way is to merge master, or
> you could cherry-pick the patches.  I can merge it later if you're not
> comfortable doing it :-)

Yes, it would be best if you handle this. I am quite sleep deprived, and
might do something stupid. :-P

[bug#30390] [PATCH 0/3] Update cmake.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 343 bytes --]

Arun Isaac <arunisaac@systemreboot.net> writes:

>> We don't rebase 'live' branches.  The best way is to merge master, or
>> you could cherry-pick the patches.  I can merge it later if you're not
>> comfortable doing it :-)
>
> Yes, it would be best if you handle this. I am quite sleep deprived, and
> might do something stupid. :-P

Merged!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

[bug#30390] [PATCH 0/3] Update cmake.

[Ludovic Courtès]

Marius Bakke <mbakke@fastmail.com> skribis:

> Arun Isaac <arunisaac@systemreboot.net> writes:
>
>> Test 92 of tar 1.30 fails on my system. I had to disable tar tests to get my
>> cmake to build. I am not entirely sure if the test failure has got something
>> to do with insufficient memory on my system. So, I'd like somebody to
>> reproduce the problem before patching it.
>
> That test fails on one of my build nodes with 64GB RAM as well.
>
> There is a bug report about it upstream:
> <https://lists.gnu.org/archive/html/bug-tar/2017-12/msg00026.html>.

I hadn’t seen your message and worked around it in a crude way:

  https://git.savannah.gnu.org/cgit/guix.git/commit/?h=core-updates&id=ad2e1422783000dd4224eab155ce532888aaef0b

The patch proposed on bug-tar seems to make sense because it fixes the
order of files in the archive.

Ludo’.

[bug#30390] [PATCH 0/3] Update cmake.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 577 bytes --]

Arun Isaac <arunisaac@systemreboot.net> writes:

> Arun Isaac (3):
>   gnu: sqlite: Fix source URI.
>   gnu: cmake: Update to 3.10.2.
>   gnu: cmake: Re-indent.
>
>  gnu/local.mk                               |   1 -
>  gnu/packages/cmake.scm                     | 154 ++++++++++++++++-------------
>  gnu/packages/databases.scm                 |   2 +-
>  gnu/packages/patches/cmake-fix-tests.patch | 120 ----------------------
>  4 files changed, 85 insertions(+), 192 deletions(-)
>  delete mode 100644 gnu/packages/patches/cmake-fix-tests.patch

Thanks!  The patches LGTM.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

[bug#30390] [PATCH 0/3] Update cmake.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 705 bytes --]

Marius Bakke <mbakke@fastmail.com> writes:

> Arun Isaac <arunisaac@systemreboot.net> writes:
>
>> Arun Isaac (3):
>>   gnu: sqlite: Fix source URI.
>>   gnu: cmake: Update to 3.10.2.
>>   gnu: cmake: Re-indent.
>>
>>  gnu/local.mk                               |   1 -
>>  gnu/packages/cmake.scm                     | 154 ++++++++++++++++-------------
>>  gnu/packages/databases.scm                 |   2 +-
>>  gnu/packages/patches/cmake-fix-tests.patch | 120 ----------------------
>>  4 files changed, 85 insertions(+), 192 deletions(-)
>>  delete mode 100644 gnu/packages/patches/cmake-fix-tests.patch
>
> Thanks!  The patches LGTM.

Ping!  Core-updates is shaping up, so now is the time to push :-)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

[bug#30390] [PATCH 0/3] Update cmake.

[Arun Isaac]

Marius Bakke <mbakke@fastmail.com> writes:

> Ping!  Core-updates is shaping up, so now is the time to push :-)

I'm rebasing against all the new changes in core-updates, and building
one last time to make sure everything is fine. Then, I'll push.

bug#30390: [PATCH 0/3] Update cmake.

[Arun Isaac]

Pushed to core-updates!