From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51254) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eoC8C-0004xi-AB for guix-patches@gnu.org; Tue, 20 Feb 2018 12:55:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eoC87-0004rJ-N5 for guix-patches@gnu.org; Tue, 20 Feb 2018 12:55:08 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:45243) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eoC87-0004qO-Go for guix-patches@gnu.org; Tue, 20 Feb 2018 12:55:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eoC85-0006tw-LG for guix-patches@gnu.org; Tue, 20 Feb 2018 12:55:02 -0500 Subject: [bug#30390] [PATCH 3/3] gnu: cmake: Update to 3.10.2. Resent-Message-ID: From: Marius Bakke In-Reply-To: <20180208121747.15072-3-arunisaac@systemreboot.net> References: <20180208121747.15072-1-arunisaac@systemreboot.net> <20180208121747.15072-3-arunisaac@systemreboot.net> Date: Tue, 20 Feb 2018 18:54:50 +0100 Message-ID: <87k1v7bl79.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Arun Isaac , 30390@debbugs.gnu.org --=-=-= Content-Type: text/plain Arun Isaac 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. :-) --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlqMYOsACgkQoqBt8qM6 VPpbMwf/Qh8gTvdgRFdvpFvI80Q12FyDRSWwtiPXFlEROppiRwScVrfQO9HyR1uc nH8NcvMD5JbhsMiIFLskvsLBUuOmD5wwTVevBs55I6ZqACnXrX7v5NUwNiVhsy/F Ng/yqF4Sg0kD0f9ABFYp03r3j+B8Yp848wEODBu6t9BW6rCJrY/yswROvl2BoN33 NgOr3tcPNIEGQ5KE59lynx/WyYBX1id6a3Rhrkv/LqGhf1t/VwKzUwMu/Tyyv80R ZIMnRX9sQIg0/L39x+IAqexNKiKjtJwZYFZ8gg97PIvZxZ1/2+Sy9eYJxuh3ax6i xvIyLaoa+sIZhipKk3kmkFqzpsKnOA== =PrHp -----END PGP SIGNATURE----- --=-=-=--