Merge branch 'master' into core-updates

Conflicts:
	gnu/local.mk
	gnu/packages/bioinformatics.scm
	gnu/packages/django.scm
	gnu/packages/gtk.scm
	gnu/packages/llvm.scm
	gnu/packages/python-web.scm
	gnu/packages/python.scm
	gnu/packages/tex.scm
	guix/build-system/asdf.scm
	guix/build/emacs-build-system.scm
	guix/profiles.scm
This commit is contained in:
Marius Bakke 2021-05-09 21:29:46 +02:00
commit f034264204
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
305 changed files with 727921 additions and 145425 deletions

File diff suppressed because it is too large Load diff