Merge branch 'master' into core-updates

Note: this merge actually changes the 'curl' and 'python-attrs' derivations,
as part of solving caf4a7a277 and
12964df69a respectively.

4604d43c0e (gnu: gnutls@3.6.16: Fix cross-compilation.) was ignored because it
cannot currently be tested.

 Conflicts:
	gnu/local.mk
	gnu/packages/aidc.scm
	gnu/packages/boost.scm
	gnu/packages/curl.scm
	gnu/packages/nettle.scm
	gnu/packages/networking.scm
	gnu/packages/python-xyz.scm
	gnu/packages/tls.scm
This commit is contained in:
Marius Bakke 2021-06-19 17:38:47 +02:00
commit 6f9a80b331
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
217 changed files with 13322 additions and 4178 deletions

View file

@ -341,7 +341,7 @@ precision.")
(define-public giac
(package
(name "giac")
(version "1.7.0-11")
(version "1.7.0-13")
(source
(origin
(method url-fetch)
@ -353,7 +353,7 @@ precision.")
"~parisse/debian/dists/stable/main/source/"
"giac_" version ".tar.gz"))
(sha256
(base32 "12njy2akcc3sj1fmq52v19m4qd1ysrdcpc9a3zslkxsnidjix81m"))))
(base32 "14ywcnk7q27fpd7cr3wixhnd51qb2h2wl2kj6zs6bw2yi6dharfk"))))
(build-system gnu-build-system)
(arguments
`(#:modules ((ice-9 ftw)