ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-19 13:17:10 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'ungrafting' into staging

Browse source
This commit is contained in:
Marius Bakke 2020-12-14 00:19:02 +01:00
commit 56e2da5ae8
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
gnu/packages/curl.scm
View file

@ -53,15 +53,15 @@ (define-module (gnu packages curl)
(define-public curl (define-public curl
(package (package
(name "curl") (name "curl")
(version "7.73.0") (version "7.74.0")
(replacement curl-7.74.0)
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://curl.haxx.se/download/curl-" (uri (string-append "https://curl.haxx.se/download/curl-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"12j0qaij1ppgspray8xvs2qk3h3m23wdqh27x87y1aw8xaj7qk3w")))) "12w7gskrglg6qrmp822j37fmbr0icrcxv7rib1fy5xiw80n5z7cr"))
(patches (search-patches "curl-use-ssl-cert-env.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" (outputs '("out"
"doc")) ;1.2 MiB of man3 pages "doc")) ;1.2 MiB of man3 pages
@ -151,19 +151,6 @@ (define-public curl-minimal
(name "curl-minimal") (name "curl-minimal")
(inputs (alist-delete "openldap" (package-inputs curl)))))) (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 (define-public kurly
(package (package
(name "kurly") (name "kurly")