01/01: Merge branch 'master' into core-updates

[Leo Famulari]

lfam pushed a commit to branch core-updates
in repository guix.

commit b3cc0dce089917b1935218296f868ab6eedff5ed
Merge: 40330e5 e681e34
Author: Leo Famulari <address@hidden>
Date:   Wed Nov 2 20:03:35 2016 -0400

    Merge branch 'master' into core-updates

 doc/guix.texi                                      |    2 +-
 gnu/local.mk                                       |    1 -
 gnu/packages/admin.scm                             |    8 +-
 gnu/packages/benchmark.scm                         |    4 +-
 gnu/packages/chez.scm                              |   96 ++++++++++++++++-
 gnu/packages/curl.scm                              |   14 +++
 gnu/packages/django.scm                            |    5 +-
 gnu/packages/dns.scm                               |    4 +-
 gnu/packages/emacs.scm                             |  114 ++++++++++++++++++--
 gnu/packages/embedded.scm                          |    2 +-
 gnu/packages/engineering.scm                       |    6 +-
 gnu/packages/game-development.scm                  |    4 +-
 gnu/packages/haskell.scm                           |   92 ++++++++++++++++
 gnu/packages/imagemagick.scm                       |    4 +-
 gnu/packages/linux.scm                             |   18 ++--
 gnu/packages/package-management.scm                |    4 +-
 .../patches/python-django-fix-testcase.patch       |   42 --------
 gnu/packages/perl.scm                              |   34 +++++-
 gnu/packages/regex.scm                             |    4 +-
 gnu/packages/search.scm                            |    4 +-
 gnu/packages/security-token.scm                    |   40 +++++++
 gnu/packages/speech.scm                            |   45 +++++++-
 gnu/packages/textutils.scm                         |   33 ++++++
 guix/download.scm                                  |    2 +
 guix/licenses.scm                                  |    2 +-
 25 files changed, 493 insertions(+), 91 deletions(-)

diff --cc gnu/local.mk
index 2447cf9,5fe6be5..a448ccb
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -790,14 -802,10 +790,13 @@@ dist_patch_DATA =                               
                
    %D%/packages/patches/python-2.7-source-date-epoch.patch     \
    %D%/packages/patches/python-3-deterministic-build-info.patch        \
    %D%/packages/patches/python-3-search-paths.patch            \
 +  %D%/packages/patches/python-3.4-fix-tests.patch             \
 +  %D%/packages/patches/python-3.5-fix-tests.patch             \
    %D%/packages/patches/python-dendropy-exclude-failing-tests.patch \
-   %D%/packages/patches/python-django-fix-testcase.patch               \
 -  %D%/packages/patches/python-disable-ssl-test.patch          \
 +  %D%/packages/patches/python-file-double-encoding-bug.patch  \
    %D%/packages/patches/python-fix-tests.patch                 \
    %D%/packages/patches/python-ipython-inputhook-ctype.patch   \
 +  %D%/packages/patches/python-parse-too-many-fields.patch     \
    %D%/packages/patches/python-rarfile-fix-tests.patch         \
    %D%/packages/patches/python2-rdflib-drop-sparqlwrapper.patch        \
    %D%/packages/patches/python-statsmodels-fix-tests.patch     \
diff --cc gnu/packages/curl.scm
index b267497,5d92e03..790f542
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@@ -40,7 -40,8 +40,8 @@@
  (define-public curl
    (package
     (name "curl")
+    (replacement curl-7.51.0)
 -   (version "7.47.0")
 +   (version "7.50.3")
     (source (origin
              (method url-fetch)
              (uri (string-append "https://curl.haxx.se/download/curl-";