diff options
| author | Marius Bakke <marius@gnu.org> | 2020-12-14 00:19:02 +0100 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-12-14 00:19:02 +0100 |
| commit | 56e2da5ae851cfa1d07ac29d0ac1a2ab9d43f36a (patch) | |
| tree | 24f5c95ed3431f19d760c038cb46ddf1db07ca8e | |
| parent | 48926b588528c5a2b591e1e97a5757eb78d3cac1 (diff) | |
| parent | a210c0d13752c38a850746fd97948121046a0e58 (diff) | |
| download | guix-56e2da5ae851cfa1d07ac29d0ac1a2ab9d43f36a.tar guix-56e2da5ae851cfa1d07ac29d0ac1a2ab9d43f36a.tar.gz | |
Merge branch 'ungrafting' into staging
| -rw-r--r-- | gnu/packages/curl.scm | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 98fc6b3d63..a09210bf04 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -53,15 +53,15 @@ (define-public curl (package (name "curl") - (version "7.73.0") - (replacement curl-7.74.0) + (version "7.74.0") (source (origin (method url-fetch) (uri (string-append "https://curl.haxx.se/download/curl-" version ".tar.xz")) (sha256 (base32 - "12j0qaij1ppgspray8xvs2qk3h3m23wdqh27x87y1aw8xaj7qk3w")))) + "12w7gskrglg6qrmp822j37fmbr0icrcxv7rib1fy5xiw80n5z7cr")) + (patches (search-patches "curl-use-ssl-cert-env.patch")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;1.2 MiB of man3 pages @@ -151,19 +151,6 @@ tunneling, and so on.") (name "curl-minimal") (inputs (alist-delete "openldap" (package-inputs curl)))))) -;; Replacement package to fix multiple security vulnerabilities. -(define curl-7.74.0 - (package - (inherit curl) - (version "7.74.0") - (source (origin - (inherit (package-source curl)) - (uri (string-append "https://curl.haxx.se/download/curl-" - version ".tar.xz")) - (sha256 - (base32 - "12w7gskrglg6qrmp822j37fmbr0icrcxv7rib1fy5xiw80n5z7cr")))))) - (define-public kurly (package (name "kurly") |