[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/12: gnu: cmake@3.15.5: Apply "cmake-curl-certificates.patch".
From: |
guix-commits |
Subject: |
03/12: gnu: cmake@3.15.5: Apply "cmake-curl-certificates.patch". |
Date: |
Sat, 11 Jan 2020 18:22:39 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 0de28f9ef94634f536118acc736a01a8c5ee239d
Author: Ludovic Courtès <address@hidden>
AuthorDate: Fri Jan 10 11:30:45 2020 +0100
gnu: cmake@3.15.5: Apply "cmake-curl-certificates.patch".
* gnu/packages/cmake.scm (cmake-3.15.5)[source]: Add 'patches' field.
(cmake/fixed): Turn into a deprecated alias for CMAKE-3.15.5.
---
gnu/packages/cmake.scm | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm
index e2c244c..de49f52 100644
--- a/gnu/packages/cmake.scm
+++ b/gnu/packages/cmake.scm
@@ -30,6 +30,7 @@
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix utils)
+ #:use-module (guix deprecation)
#:use-module (guix build-system gnu)
#:use-module (guix build-system emacs)
#:use-module (gnu packages)
@@ -207,22 +208,13 @@ and workspaces that can be used in the compiler
environment of your choice.")
(outputs '("out" "doc"))
(properties (alist-delete 'hidden? (package-properties cmake-minimal)))))
-(define-public cmake/fixed
- ;; This is a variant of CMake that fixes X.509 certificate lookup:
- ;; <https://issues.guix.gnu.org/issue/37371>.
- (package
- (inherit cmake)
- (version (string-append (package-version cmake) "-1"))
- (source (origin
- (inherit (package-source cmake))
- (patches
- (append (search-patches "cmake-curl-certificates.patch")
- (origin-patches (package-source cmake))))))))
-
(define-public cmake-3.15.5
;; CMake 3.15.5 fixes some issues, but declare another version to
;; avoid triggering the rebuild of all CMake-based packages.
;; See <https://issues.guix.gnu.org/issue/38060>.
+ ;;
+ ;; Furthermore, this variant fixes X.509 certificate lookup:
+ ;; <https://issues.guix.gnu.org/issue/37371>.
(package
(inherit cmake)
(version "3.15.5")
@@ -233,7 +225,14 @@ and workspaces that can be used in the compiler
environment of your choice.")
"/cmake-" version ".tar.gz"))
(sha256
(base32
- "1d5y8d92axcc6rfqlsxamayfs3fc1vdby91hn5mx1kn02ppprpgv"))))))
+ "1d5y8d92axcc6rfqlsxamayfs3fc1vdby91hn5mx1kn02ppprpgv"))
+ (patches
+ (append (search-patches "cmake-curl-certificates.patch")
+ (origin-patches (package-source cmake))))))))
+
+;; This was cmake@3.15.1 plus "cmake-curl-certificates.patch".
+(define-deprecated cmake/fixed cmake-3.15.5)
+(export cmake/fixed)
(define-public emacs-cmake-mode
(package
- branch master updated (6b9839e -> f9e0488), guix-commits, 2020/01/11
- 02/12: gnu: Use the two-element 'define-deprecated' form where applicable., guix-commits, 2020/01/11
- 03/12: gnu: cmake@3.15.5: Apply "cmake-curl-certificates.patch".,
guix-commits <=
- 05/12: daemon: Account for deleted store files when deduplication is on., guix-commits, 2020/01/11
- 08/12: gnu: entr: Fix references to external programs., guix-commits, 2020/01/11
- 12/12: doc: Make sure 'htmlxref.cnf' is honored., guix-commits, 2020/01/11
- 01/12: deprecation: Add a two-element form for simple aliases., guix-commits, 2020/01/11
- 07/12: system: Drop net-tools from %BASE-PACKAGES (replaced by iproute2)., guix-commits, 2020/01/11
- 06/12: daemon: Fix the displayed GC estimated progress., guix-commits, 2020/01/11
- 09/12: gnu: timidity++: Add libvorbis as input, guix-commits, 2020/01/11
- 11/12: doc: Update htmlxref.cnf., guix-commits, 2020/01/11
- 04/12: gnu: cmake@3.15.5: Honor 'SSL_CERT_DIR' and 'SSL_CERT_FILE'., guix-commits, 2020/01/11
- 10/12: gnu: Add libolm., guix-commits, 2020/01/11