Merge branch 'master' into core-updates
authorTobias Geerinckx-Rice <me@tobias.gr>
Wed, 23 Jun 2021 16:45:21 +0000 (18:45 +0200)
committerTobias Geerinckx-Rice <me@tobias.gr>
Wed, 23 Jun 2021 16:45:21 +0000 (18:45 +0200)
commit9dea3f101f252331c049c03f501398a5ec837ba9
tree61d683a9fae3e147332d07fef207c1ddf51fc301
parent7f0af119a1e3ea9d0ae53811b619437b3e942702
parent620669fd17306c2edb21c64a99fa47160fefb319
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
35 files changed:
doc/guix.texi
gnu/local.mk
gnu/packages/admin.scm
gnu/packages/algebra.scm
gnu/packages/audio.scm
gnu/packages/backup.scm
gnu/packages/bioinformatics.scm
gnu/packages/crates-io.scm
gnu/packages/databases.scm
gnu/packages/emacs-xyz.scm
gnu/packages/emulators.scm
gnu/packages/engineering.scm
gnu/packages/game-development.scm
gnu/packages/games.scm
gnu/packages/gnome.scm
gnu/packages/java.scm
gnu/packages/linux.scm
gnu/packages/lua.scm
gnu/packages/mail.scm
gnu/packages/maths.scm
gnu/packages/messaging.scm
gnu/packages/networking.scm
gnu/packages/protobuf.scm
gnu/packages/python-web.scm
gnu/packages/python-xyz.scm
gnu/packages/radio.scm
gnu/packages/serialization.scm
gnu/packages/text-editors.scm
gnu/packages/tmux.scm
gnu/packages/video.scm
gnu/packages/virtualization.scm
gnu/packages/vpn.scm
gnu/packages/web.scm
gnu/services/cups.scm
guix/build/maven/pom.scm