Merge branch 'core-updates'

Conflicts:
	gnu/packages/gnunet.scm

diff --cc gnu/packages/gnunet.scm
index a92fcad,0f5f32b..69cd74e
--- 1/gnu/packages/gnunet.scm
--- 2/gnu/packages/gnunet.scm
+++ b/gnu/packages/gnunet.scm
@@@ -20,9 -20,7 +20,8 @@@
    #:use-module (gnu packages autotools)
    #:use-module (gnu packages compression)
    #:use-module (gnu packages curl)
-   #:use-module ((gnu packages gettext)
-                 #:renamer (symbol-prefix-proc 'gnu:))
 +  #:use-module (gnu packages geeqie)
+   #:use-module (gnu packages gettext)
    #:use-module (gnu packages glib)
    #:use-module (gnu packages gnupg)
    #:use-module (gnu packages gnutls)
@@@ -68,13 -67,9 +67,13 @@@
     ;; * libsmf
     ;; * libtidy
     (inputs
 -    `(("gettext" ,gnu-gettext)
 +    `(("exiv2" ,exiv2)
        ("flac" ,flac)
-       ("gettext" ,gnu:gettext)
 +      ("ffmpeg" ,ffmpeg)
++      ("gettext" ,gnu-gettext)
        ("glib" ,glib)
 +      ("gstreamer" ,gstreamer)
 +      ("gst-plugins-base" ,gst-plugins-base)
        ("libjpeg" ,libjpeg)
        ("libogg" ,libogg)
        ("libtiff" ,libtiff)

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

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