Merge branch 'master' into core-updates

Conflicts:
	gnu/local.mk
	gnu/packages/backup.scm
	gnu/packages/emacs-xyz.scm
	gnu/packages/guile.scm
	gnu/packages/lisp.scm
	gnu/packages/openldap.scm
	gnu/packages/package-management.scm
	gnu/packages/web.scm
	gnu/packages/xorg.scm
This commit is contained in:
Marius Bakke 2020-04-30 23:47:49 +02:00
commit 8bf8cd9b85
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
69 changed files with 6231 additions and 782 deletions

View file

@ -1777,7 +1777,7 @@ that parenthetically inclined game developers need to make 2D (and eventually
(define-public guile3.0-chickadee
(package
(inherit guile-chickadee)
(name "guile-chickadee")
(name "guile3.0-chickadee")
(version "0.4.0")
(source (origin
(method url-fetch)