Merge branch 'master' into core-updates

Conflicts:
	gnu/local.mk
	gnu/packages/algebra.scm
	gnu/packages/bioinformatics.scm
	gnu/packages/curl.scm
	gnu/packages/docbook.scm
	gnu/packages/emacs-xyz.scm
	gnu/packages/maths.scm
	gnu/packages/plotutils.scm
	gnu/packages/python-web.scm
	gnu/packages/python-xyz.scm
	gnu/packages/radio.scm
	gnu/packages/readline.scm
	gnu/packages/tls.scm
	gnu/packages/xml.scm
	gnu/packages/xorg.scm
This commit is contained in:
Marius Bakke 2021-06-06 21:16:32 +02:00
commit 8d59c262ad
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
176 changed files with 16041 additions and 6439 deletions

View file

@ -53,6 +53,7 @@
(define-public curl
(package
(name "curl")
(replacement curl-7.77.0)
(version "7.76.1")
(source (origin
(method url-fetch)
@ -145,6 +146,20 @@ tunneling, and so on.")
(define-public curl-minimal
(deprecated-package "curl-minimal" curl))
(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"))
(sha256
(base32
"0jsrc97vbghvljic997r9nypc9qqddcil2lzvv032br8ahn5hr0g"))))))
(define-public kurly
(package
(name "kurly")