Merge branch 'master' into core-updates

diff --cc gnu/local.mk
index a1700a5,c130901..0287bef
--- 1/gnu/local.mk
--- 2/gnu/local.mk
+++ b/gnu/local.mk
@@@ -491,9 -495,9 +492,10 @@@ dist_patch_DATA =                                         
    gnu/packages/patches/gawk-shell.patch                               \
    gnu/packages/patches/gcc-arm-link-spec-fix.patch            \
    gnu/packages/patches/gcc-cross-environment-variables.patch  \
 +  gnu/packages/patches/gcc-libiberty-printf-decl.patch                \
    gnu/packages/patches/gcc-libvtv-runpath.patch                       \
    gnu/packages/patches/gcc-5.0-libvtv-runpath.patch           \
+   gnu/packages/patches/gd-CVE-2016-3074.patch                 \
    gnu/packages/patches/geoclue-config.patch                   \
    gnu/packages/patches/ghostscript-CVE-2015-3228.patch                \
    gnu/packages/patches/ghostscript-runpath.patch              \

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

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

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

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

diff --cc gnu/packages/linux.scm
index 6e3228f,5b1d2a9..90f5602
--- 1/gnu/packages/linux.scm
--- 2/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@@ -2550,22 -2559,10 +2573,22 @@@ and copy/paste text in the console and 
                                    "btrfs-progs-v" version ".tar.xz"))
                (sha256
                 (base32
-                 "1znf2zhb56zbmdjk3lq107678xwsqwc5gczspypmc5i31qnppy7f"))))
+                 "1lzbw275xgv69v4z8hmsf3jnip38116hxhkpv0madk8wv049drz6"))))
      (build-system gnu-build-system)
 +    (outputs '("out"
 +               "static"))      ; static versions of binaries in "out" (~16MiB!)
      (arguments
 -     '(#:test-target "test"
 +     '(#:phases (modify-phases %standard-phases
 +                 (add-after 'build 'build-static
 +                   (lambda _ (zero? (system* "make" "static"))))
 +                 (add-after 'install 'install-static
 +                   (let ((staticbin (string-append (assoc-ref %outputs "static")
 +                                                  "/bin")))
 +                     (lambda _
 +                       (zero? (system* "make"
 +                                       (string-append "bindir=" staticbin)
 +                                       "install-static"))))))
 +       #:test-target "test"
         #:parallel-tests? #f)) ; tests fail when run in parallel
      (inputs `(("e2fsprogs" ,e2fsprogs)
                ("libblkid" ,util-linux)

diff --cc gnu/packages/python.scm
index adef5e6,602da2d..d2698d4
--- 1/gnu/packages/python.scm
--- 2/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@@ -90,10 -91,10 +91,10 @@@
    #:use-module (guix build-system trivial)
    #:use-module (srfi srfi-1))
  
- (define-public python-2
+ (define-public python-2.7
    (package
      (name "python")
 -    (version "2.7.10")
 +    (version "2.7.11")
      (source
       (origin
        (method url-fetch)

diff --cc gnu/packages/scheme.scm
index 5601d6c,6f2ce9f..c345d59
--- 1/gnu/packages/scheme.scm
--- 2/gnu/packages/scheme.scm
+++ b/gnu/packages/scheme.scm
@@@ -1,9 -1,10 +1,10 @@@
  ;;; GNU Guix --- Functional package management for GNU
  ;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
  ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
 -;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
 +;;; Copyright © 2015, 2016 Federico Beffa <beffa@fbengineering.ch>
  ;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
  ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
+ ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;
@@@ -22,19 -23,17 +23,23 @@@
  
  (define-module (gnu packages scheme)
    #:use-module (gnu packages)
-   #:use-module ((guix licenses) #:select (gpl2+ lgpl2.0+ lgpl2.1+ asl2.0 bsd-3))
 -  #:use-module (guix licenses)
++  #:use-module ((guix licenses)
++                #:select (gpl2+ lgpl2.0+ lgpl2.1+ asl2.0 bsd-3
++                          cc-by-sa4.0))
    #:use-module (guix packages)
    #:use-module (guix download)
+   #:use-module (guix git-download)
    #:use-module (guix utils)
    #:use-module (guix build-system gnu)
+   #:use-module (guix build-system trivial)
 +  #:use-module (gnu packages compression)
    #:use-module (gnu packages m4)
    #:use-module (gnu packages multiprecision)
 +  #:use-module (gnu packages ncurses)
    #:use-module (gnu packages databases)
    #:use-module (gnu packages emacs)
 +  #:use-module (gnu packages ghostscript)
 +  #:use-module (gnu packages netpbm)
    #:use-module (gnu packages texinfo)
    #:use-module (gnu packages texlive)
    #:use-module (gnu packages base)

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

diff --cc gnu/packages/xml.scm
index 538996f,9eaf71a..a5ea3d0
--- 1/gnu/packages/xml.scm
--- 2/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@@ -4,10 -4,10 +4,11 @@@
  ;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
  ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
  ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
 -;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
 +;;; Copyright © 2015, 2016 Mark H Weaver <mhw@netris.org>
  ;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
  ;;; Copyright © 2015 Raimon Grau <raimonster@gmail.com>
 +;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
+ ;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;