Merge branch 'master' into core-updates

Conflicts:
	gnu/packages/cups.scm
	gnu/packages/python-web.scm
	gnu/packages/web.scm
	guix/build/maven/pom.scm
This commit is contained in:
Tobias Geerinckx-Rice 2021-06-23 18:45:21 +02:00
commit 9dea3f101f
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
72 changed files with 2096 additions and 751 deletions

View file

@ -76,7 +76,7 @@
(define-public mpfrcx
(package
(name "mpfrcx")
(version "0.6.1")
(version "0.6.2")
(source (origin
(method url-fetch)
(uri (string-append
@ -84,7 +84,7 @@
version ".tar.gz"))
(sha256
(base32
"0gk2l40awp3q1lh828dhcjshcldy3b1l2v51glaq0lj1h7w34sin"))))
"165syd6kihwp6bry9hvr3v0908cgadsz5w5h5ry4mjnchrklnb7w"))))
(build-system gnu-build-system)
(propagated-inputs
`(("gmp" ,gmp)