Merge branch 'master' into core-updates
authorMarius Bakke <mbakke@fastmail.com>
Thu, 11 Jul 2019 23:03:53 +0000 (01:03 +0200)
committerMarius Bakke <mbakke@fastmail.com>
Thu, 11 Jul 2019 23:03:53 +0000 (01:03 +0200)
commitfb9a23a3f3ad3d7b5b7f03b2007baf27684d6bbd
treeafbd3f4f33771c61254b0c3d977092542fbe8009
parent1c4b72cb34640638e40c5190676e5c8c352d292d
parent5a836ce38c9c29e9c2bd306007347486b90c5064
Merge branch 'master' into core-updates

 Conflicts:
gnu/local.mk
gnu/packages/python-xyz.scm
gnu/packages/xml.scm
guix/gexp.scm
po/guix/POTFILES.in
31 files changed:
Makefile.am
doc/guix.texi
gnu/local.mk
gnu/packages/bioinformatics.scm
gnu/packages/chromium.scm
gnu/packages/databases.scm
gnu/packages/emacs-xyz.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/gnuzilla.scm
gnu/packages/image.scm
gnu/packages/linux.scm
gnu/packages/music.scm
gnu/packages/package-management.scm
gnu/packages/pdf.scm
gnu/packages/pulseaudio.scm
gnu/packages/python-web.scm
gnu/packages/python-xyz.scm
gnu/packages/time.scm
gnu/packages/version-control.scm
gnu/packages/web.scm
gnu/packages/wm.scm
gnu/packages/xdisorg.scm
gnu/packages/xml.scm
guix/gexp.scm
guix/scripts/environment.scm
guix/scripts/pack.scm
guix/self.scm
po/guix/POTFILES.in
tests/derivations.scm
tests/guix-environment.sh