[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
12/12: gnu: Remove 'curl-minimal'.
From: |
guix-commits |
Subject: |
12/12: gnu: Remove 'curl-minimal'. |
Date: |
Wed, 16 Dec 2020 18:17:29 -0500 (EST) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit c78964efa87b257991262eab0ef3ac6b719e286c
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Wed Dec 16 19:20:39 2020 +0100
gnu: Remove 'curl-minimal'.
* gnu/packages/curl.scm (curl-minimal): Deprecate variable.
* gnu/packages/games.scm (yamagi-quake2)[inputs]: Replace CURL-MINIMAL with
CURL.
* gnu/packages/cmake.scm (cmake-bootstrap)[inputs]: Likewise.
(cmake-minimal)[inputs]: Don't override the "curl" input.
---
gnu/packages/cmake.scm | 7 +++----
gnu/packages/curl.scm | 8 +-------
gnu/packages/games.scm | 2 +-
3 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm
index 7316a3b..a68dbdd 100644
--- a/gnu/packages/cmake.scm
+++ b/gnu/packages/cmake.scm
@@ -207,7 +207,7 @@
(apply invoke "./configure" configure-flags))))))
(inputs
`(("bzip2" ,bzip2)
- ("curl" ,curl-minimal)
+ ("curl" ,curl)
("expat" ,expat)
("file" ,file)
("libarchive" ,libarchive)
@@ -259,9 +259,8 @@ and workspaces that can be used in the compiler environment
of your choice.")
(define preserved-files
',%preserved-third-party-files))
exp))))))
(inputs
- `(("curl" ,curl)
- ("jsoncpp" ,jsoncpp)
- ,@(alist-delete "curl" (package-inputs cmake-bootstrap))))
+ `(("jsoncpp" ,jsoncpp)
+ ,@(package-inputs cmake-bootstrap)))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index f39dc54..f9de1eb 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -142,14 +142,8 @@ tunneling, and so on.")
"See COPYING in the distribution."))
(home-page "https://curl.haxx.se/")))
-;; This package exists mainly to bootstrap CMake. It must not depend on
-;; anything that uses cmake-build-system.
(define-public curl-minimal
- (hidden-package
- (package/inherit
- curl
- (name "curl-minimal")
- (inputs (alist-delete "openldap" (package-inputs curl))))))
+ (deprecated-package "curl-minimal" curl))
(define-public kurly
(package
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 1b7faa9..9109231 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -6856,7 +6856,7 @@ some graphical niceities, and numerous bug-fixes and
other improvements.")
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
- `(("curl" ,curl-minimal)
+ `(("curl" ,curl)
("libvorbis" ,libvorbis)
("mesa" ,mesa)
("openal" ,openal)
- 03/12: gnu: perl-module-build: Update to 0.4231., (continued)
- 03/12: gnu: perl-module-build: Update to 0.4231., guix-commits, 2020/12/16
- 02/12: gnu: expat: Update to 2.2.10., guix-commits, 2020/12/16
- 04/12: gnu: perl-test-needs: Update to 0.002006., guix-commits, 2020/12/16
- 08/12: gnu: gdbm: Fix build with GCC 10., guix-commits, 2020/12/16
- 09/12: gnu: tcsh: Update to 6.22.03., guix-commits, 2020/12/16
- 05/12: gnu: Perl: Update to 5.32.0., guix-commits, 2020/12/16
- 07/12: gnu: bdb: Fix building with GCC 9., guix-commits, 2020/12/16
- 06/12: gnu: isl: Update to 0.23., guix-commits, 2020/12/16
- 10/12: gnu: glib: Disable SELinux support., guix-commits, 2020/12/16
- 11/12: gnu: cURL: Don't build with OpenLDAP., guix-commits, 2020/12/16
- 12/12: gnu: Remove 'curl-minimal'.,
guix-commits <=