Merge branch 'master' into core-updates Conflicts: Makefile.am guix/scripts/gc.scm guix/scripts/package.scm guix/ui.scm tests/guix-package.sh
gnu: global: Update to 6.2.8. * gnu/packages/global.scm (global): Update to 6.2.8.
gnu: Fix invalid `license' fields. * gnu/packages/acl.scm (acl): Change `license' field to refer to the `license' objects. * gnu/packages/attr.scm (attr): Likewise. * gnu/packages/compression.scm (xz): Likewise. * gnu/packages/global.scm (global): Likewise. * gnu/packages/linux.scm (linux-libre-headers): Likewise.
distro: Rename (distro) to (gnu packages). * distro.scm: Rename to... * gnu/packages.scm: ... this. Update all users accordingly. * Makefile.am (MODULES): Adjust accordingly. * po/POTFILES.in: Likewise.
distro: Change the module name space to (gnu ...). * distro: Rename to... * gnu: ... this. Update module names accordingly. * Makefile.am: Adjust accordingly. * po/POTFILES.in: Likewise. * distro.scm: Search for files under /gnu/packages instead of /distro/packages. * gnu/packages/base.scm (ld-wrapper-boot3): Likewise.
distro: Add GNU GLOBAL. * distro/packages/global.scm: New file. * Makefile.am (MODULES): Add it.