diff options
Diffstat (limited to 'gnu/packages/curl.scm')
| -rw-r--r-- | gnu/packages/curl.scm | 39 |
1 files changed, 9 insertions, 30 deletions
diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index e6f1bb0c41..39344b1d9f 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2019, 2021 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> ;;; Copyright © 2020 Dale Mellor <guix-devel-0brg6b@rdmp.org> +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2021 Jean-Baptiste Volatier <jbv@pm.me> ;;; ;;; This file is part of GNU Guix. @@ -43,7 +44,6 @@ #:use-module (gnu packages guile) #:use-module (gnu packages kerberos) #:use-module (gnu packages libidn) - #:use-module (gnu packages openldap) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -55,29 +55,29 @@ (define-public curl (package (name "curl") - (replacement curl-7.77.0) - (version "7.74.0") + (version "7.77.0") (source (origin (method url-fetch) (uri (string-append "https://curl.haxx.se/download/curl-" version ".tar.xz")) (sha256 (base32 - "12w7gskrglg6qrmp822j37fmbr0icrcxv7rib1fy5xiw80n5z7cr")) - (patches (search-patches "curl-use-ssl-cert-env.patch")))) + "0jsrc97vbghvljic997r9nypc9qqddcil2lzvv032br8ahn5hr0g")) + (patches (search-patches "curl-use-ssl-cert-env.patch" + "curl-7.77-tls-priority-string.patch")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;1.2 MiB of man3 pages (inputs `(("gnutls" ,gnutls) ("libidn" ,libidn) - ("openldap" ,openldap) ("mit-krb5" ,mit-krb5) ("nghttp2" ,nghttp2 "lib") ("zlib" ,zlib))) (native-inputs - `(("perl" ,perl) + `(("nghttp2" ,nghttp2) + ("perl" ,perl) ("pkg-config" ,pkg-config) - ("python" ,python-wrapper))) + ("python" ,python-minimal-wrapper))) (native-search-paths ;; These variables are introduced by curl-use-ssl-cert-env.patch. (list (search-path-specification @@ -145,14 +145,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 curl-ssh (package/inherit curl @@ -165,21 +159,6 @@ tunneling, and so on.") ,@(package-inputs curl))) (properties `((hidden? . #t))))) -(define-public curl-7.77.0 - (package - (inherit curl) - (version "7.77.0") - (source - (origin - (inherit (package-source curl)) - (uri (string-append "https://curl.haxx.se/download/curl-" - version ".tar.xz")) - (patches (search-patches "curl-7.76-use-ssl-cert-env.patch" - "curl-7.77-tls-priority-string.patch")) - (sha256 - (base32 - "0jsrc97vbghvljic997r9nypc9qqddcil2lzvv032br8ahn5hr0g")))))) - (define-public kurly (package (name "kurly") |