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.
This commit is contained in:
Marius Bakke 2020-12-16 19:20:39 +01:00
parent 2add5b2032
commit c78964efa8
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
3 changed files with 5 additions and 12 deletions

View file

@ -207,7 +207,7 @@ (define preserved-files
(apply invoke "./configure" configure-flags)))))) (apply invoke "./configure" configure-flags))))))
(inputs (inputs
`(("bzip2" ,bzip2) `(("bzip2" ,bzip2)
("curl" ,curl-minimal) ("curl" ,curl)
("expat" ,expat) ("expat" ,expat)
("file" ,file) ("file" ,file)
("libarchive" ,libarchive) ("libarchive" ,libarchive)
@ -259,9 +259,8 @@ (define-public cmake-minimal
(define preserved-files ',%preserved-third-party-files)) (define preserved-files ',%preserved-third-party-files))
exp)))))) exp))))))
(inputs (inputs
`(("curl" ,curl) `(("jsoncpp" ,jsoncpp)
("jsoncpp" ,jsoncpp) ,@(package-inputs cmake-bootstrap)))
,@(alist-delete "curl" (package-inputs cmake-bootstrap))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags

View file

@ -142,14 +142,8 @@ (define-public curl
"See COPYING in the distribution.")) "See COPYING in the distribution."))
(home-page "https://curl.haxx.se/"))) (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 (define-public curl-minimal
(hidden-package (deprecated-package "curl-minimal" curl))
(package/inherit
curl
(name "curl-minimal")
(inputs (alist-delete "openldap" (package-inputs curl))))))
(define-public kurly (define-public kurly
(package (package

View file

@ -6856,7 +6856,7 @@ (define-public yamagi-quake2
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
(inputs (inputs
`(("curl" ,curl-minimal) `(("curl" ,curl)
("libvorbis" ,libvorbis) ("libvorbis" ,libvorbis)
("mesa" ,mesa) ("mesa" ,mesa)
("openal" ,openal) ("openal" ,openal)