Merge branch 'master' into core-updates

Conflicts:
	gnu-system.am

diff --cc gnu-system.am
index d993571,d63a80f..29103f9
--- 1/gnu-system.am
--- 2/gnu-system.am
+++ b/gnu-system.am
@@@ -234,8 -250,9 +250,9 @@@ dist_patch_DATA =                                          
    gnu/packages/patches/binutils-loongson-workaround.patch     \
    gnu/packages/patches/cdparanoia-fpic.patch                  \
    gnu/packages/patches/cmake-fix-tests.patch                  \
 +  gnu/packages/patches/coreutils-dummy-man.patch              \
    gnu/packages/patches/cpio-gets-undeclared.patch             \
+   gnu/packages/patches/curl-fix-test172.patch                 \
    gnu/packages/patches/dbus-localstatedir.patch                       \
    gnu/packages/patches/diffutils-gets-undeclared.patch                \
    gnu/packages/patches/dmd-getpw.patch                                \
@@@ -253,6 -270,9 +270,8 @@@
    gnu/packages/patches/glib-tests-prlimit.patch                       \
    gnu/packages/patches/glibc-bootstrap-system.patch           \
    gnu/packages/patches/glibc-ldd-x86_64.patch                 \
 -  gnu/packages/patches/glibc-make-4.0.patch                   \
+   gnu/packages/patches/gnunet-fix-scheduler.patch             \
+   gnu/packages/patches/gnunet-fix-tests.patch                 \
    gnu/packages/patches/gobject-introspection-cc.patch         \
    gnu/packages/patches/grub-gets-undeclared.patch             \
    gnu/packages/patches/gstreamer-0.10-bison3.patch            \

diff --cc gnu/packages/gnupg.scm
Simple merge

diff --cc gnu/system.scm
Simple merge

diff --cc guix/derivations.scm
Simple merge