ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-26 06:18:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: cmake-bootstrap: Update to 3.21.3.

Browse source 
* gnu/packages/cmake.scm (cmake-bootstrap): Update to 3.21.3.
(cmake)[source]: Delete field, updating the package to 3.21.3 also.  Remove
trailing #t.
(%common-disabled-tests) <CMake.FileDownload>: Add test.
This commit is contained in:
Maxim Cournoyer 2021-10-15 00:33:59 -04:00
parent 1abc9cae28
commit 6933a32b8b
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gnu/packages/cmake.scm
View file

@ -8,7 +8,7 @@
;;; Copyright © 2017, 2018, 2020, 2021 Marius Bakke <marius@gnu.org> ;;; Copyright © 2017, 2018, 2020, 2021 Marius Bakke <marius@gnu.org>
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019, 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2019, 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2019 Pierre-Moana Levesque <pierre.moana.levesque@gmail.com> ;;; Copyright © 2019 Pierre-Moana Levesque <pierre.moana.levesque@gmail.com>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2021 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2021 Ricardo Wurmus <rekado@elephly.net>
@ -130,8 +130,8 @@ (define %common-disabled-tests
'(;; This test copies libgcc_s.so.1 from GCC and tries to modify its RPATH, '(;; This test copies libgcc_s.so.1 from GCC and tries to modify its RPATH,
;; but does not cope with the file being read-only. ;; but does not cope with the file being read-only.
"BundleUtilities" "BundleUtilities"
;; This test requires network access. ;; These tests require network access.
"CTestTestUpload" "CTestTestUpload" "CMake.FileDownload"
;; This test requires 'ldconfig' which is not available in Guix. ;; This test requires 'ldconfig' which is not available in Guix.
"RunCMake.install" "RunCMake.install"
;; This test fails for unknown reason. ;; This test fails for unknown reason.
@ -150,7 +150,7 @@ (define %preserved-third-party-files
(define-public cmake-bootstrap (define-public cmake-bootstrap
(package (package
(name "cmake-bootstrap") (name "cmake-bootstrap")
(version "3.20.2") (version "3.21.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://cmake.org/files/v" (uri (string-append "https://cmake.org/files/v"
@ -158,7 +158,7 @@ (define-public cmake-bootstrap
"/cmake-" version ".tar.gz")) "/cmake-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0kjlb7sxbwg8z4027c3jjcmyjh9d36p0r9d4nqxynyaijz5nxkxf")) "0kvrhgbrvm0lv7jshzd4nsvp3d5q1jkgal2d5kj4w4v58bghckfi"))
(patches (search-patches "cmake-curl-certificates.patch")))) (patches (search-patches "cmake-curl-certificates.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
@ -339,15 +339,6 @@ (define-public cmake
(package (package
(inherit cmake-minimal) (inherit cmake-minimal)
(name "cmake") (name "cmake")
(version "3.21.1")
(source (origin
(inherit (package-source cmake-bootstrap))
(uri (string-append "https://cmake.org/files/v"
(version-major+minor version)
"/cmake-" version ".tar.gz"))
(sha256
(base32
"1m7y9j5lafkrfswsg2vkpx2fz6p6fqpp2pcp2dcz5pylf58r3hzs"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments cmake-minimal) (substitute-keyword-arguments (package-arguments cmake-minimal)
;; Use cmake-minimal this time. ;; Use cmake-minimal this time.
@ -380,8 +371,7 @@ (define-public cmake
"/html"))) "/html")))
(copy-recursively (string-append out html) (copy-recursively (string-append out html)
(string-append doc html)) (string-append doc html))
(delete-file-recursively (string-append out html)) (delete-file-recursively (string-append out html)))))))))
#t)))))))
(inputs (inputs
`(("ncurses" ,ncurses) ;required for ccmake `(("ncurses" ,ncurses) ;required for ccmake
,@(package-inputs cmake-minimal))) ,@(package-inputs cmake-minimal)))