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

@ -142,7 +142,7 @@ such as compact binary encodings, XML, or JSON.")
(define-public msgpack
(package
(name "msgpack")
(version "3.2.1")
(version "3.3.0")
(source
(origin
(method url-fetch)
@ -157,7 +157,7 @@ such as compact binary encodings, XML, or JSON.")
(close-output-port p)
#t))
(sha256
(base32 "1ljqmgscdb0f8w8kx2lnswnisyxchcmijbjbmswkv0g187bvqg23"))))
(base32 "0yzhq50ijvwrfkr97knhvn54lj3f4hr3zy39yq8wpf6xll94s4bf"))))
(build-system cmake-build-system)
(native-inputs
`(("googletest" ,googletest-1.8)