[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
31/94: gnu: Remove cmake/fixed.
From: |
guix-commits |
Subject: |
31/94: gnu: Remove cmake/fixed. |
Date: |
Thu, 5 Dec 2019 12:15:31 -0500 (EST) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit a4de5cfd2f75f19d751a2f37d758b500bfd19a7e
Author: Marius Bakke <address@hidden>
Date: Tue Dec 3 00:13:03 2019 +0100
gnu: Remove cmake/fixed.
* gnu/packages/cmake.scm (cmake/fixed): Remove variable.
(cmake-minimal)[source](patches): Add "cmake-curl-certificates.patch".
---
gnu/packages/cmake.scm | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm
index 5c9b981..135863f 100644
--- a/gnu/packages/cmake.scm
+++ b/gnu/packages/cmake.scm
@@ -75,7 +75,8 @@
"cmliblzma"
;; "cmlibuv"
"cmzlib"))
- #t)))))
+ #t)))
+ (patches (search-patches "cmake-curl-certificates.patch"))))
(build-system gnu-build-system)
(arguments
`(#:test-target "test"
@@ -209,18 +210,6 @@ 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-minimal-cross
(package
(inherit cmake-minimal)
- 54/94: gnu: libxpm: Do not build static libraries., (continued)
- 54/94: gnu: libxpm: Do not build static libraries., guix-commits, 2019/12/05
- 74/94: gnu: xcb-util: Do not build static libraries., guix-commits, 2019/12/05
- 78/94: gnu: xcb-util-renderutil: Do not build static libraries., guix-commits, 2019/12/05
- 73/94: gnu: libxaw: Do not build static libraries., guix-commits, 2019/12/05
- 86/94: gnu: xorgproto: Update to 2019.2., guix-commits, 2019/12/05
- 13/94: gnu: jbig2dec: Update to 0.17., guix-commits, 2019/12/05
- 14/94: gnu: glibc: Update to 2.30., guix-commits, 2019/12/05
- 15/94: gnu: zstd: Update to 1.4.4., guix-commits, 2019/12/05
- 22/94: gnu: readline: Add a version parameter to patch procedures., guix-commits, 2019/12/05
- 18/94: gnu: libffi: Update to 3.3., guix-commits, 2019/12/05
- 31/94: gnu: Remove cmake/fixed.,
guix-commits <=
- 24/94: gnu: icu4c: Update to 65.1., guix-commits, 2019/12/05
- 36/94: gnu: libspiro: Update to 20190731., guix-commits, 2019/12/05
- 35/94: gnu: meson: Update to 0.52.1., guix-commits, 2019/12/05
- 34/94: gnu: doxygen: Update to 1.8.16., guix-commits, 2019/12/05
- 32/94: gnu: CMake: Update to 3.16.0., guix-commits, 2019/12/05
- 38/94: gnu: libxslt: Update to 1.1.34., guix-commits, 2019/12/05
- 45/94: gnu: libxi: Do not build static libraries., guix-commits, 2019/12/05
- 47/94: gnu: libxshmfence: Do not build static libraries., guix-commits, 2019/12/05
- 06/94: gnu: expat: Remove grafted replacement., guix-commits, 2019/12/05
- 55/94: gnu: libxres: Do not build static libraries., guix-commits, 2019/12/05