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

[Mark H. Weaver]

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

commit 3d82676919b952d0a7e205fa5da6320b1cf21e21
Merge: f9a6531 7500e42
Author: Mark H Weaver <address@hidden>
Date:   Thu Oct 27 20:21:26 2016 -0400

    Merge branch 'master' into core-updates

 build-aux/run-system-tests.scm  |    3 +-
 gnu/build/file-systems.scm      |   35 ++++----
 gnu/packages/bioinformatics.scm |   33 ++++++++
 gnu/packages/dav.scm            |    4 +-
 gnu/packages/gnome.scm          |    7 +-
 gnu/packages/gnupg.scm          |   11 ++-
 gnu/packages/gnustep.scm        |    5 +-
 gnu/packages/image.scm          |    4 +-
 gnu/packages/linux.scm          |   33 +++++++-
 gnu/packages/python.scm         |    9 +-
 gnu/packages/sdl.scm            |   35 ++++----
 gnu/packages/security-token.scm |   38 ++++++++-
 gnu/packages/statistics.scm     |    8 ++
 gnu/packages/textutils.scm      |   86 ++++++++++++++++++++
 gnu/packages/valgrind.scm       |   29 +++----
 gnu/system/mapped-devices.scm   |    8 +-
 gnu/tests/install.scm           |  172 ++++++++++++++++++++++++++++++++++++++-
 tests/pypi.scm                  |    4 +-
 tests/syscalls.scm              |    5 +-
 19 files changed, 455 insertions(+), 74 deletions(-)

diff --cc gnu/packages/gnupg.scm
index dd75ea5,60c43ab..a3a42cc
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@@ -240,21 -271,14 +243,25 @@@ compatible to GNU Pth."
      `(#:configure-flags '("--enable-gpg2-is-gpg")
        #:phases
        (modify-phases %standard-phases
-         (add-before 'configure 'patch-config-files
-           (lambda _
+         (add-before 'configure 'patch-paths
+           (lambda* (#:key inputs #:allow-other-keys)
              (substitute* "tests/openpgp/defs.inc"
                (("/bin/pwd") (which "pwd")))
+             (substitute* "scd/scdaemon.c"
+               (("\"(libpcsclite\\.so[^\"]*)\"" _ name)
+                (string-append "\"" (assoc-ref inputs "pcsc-lite")
+                               "/lib/" name "\"")))
 +            #t))
 +        (add-after 'build 'patch-scheme-tests
 +          (lambda _
 +            (substitute* (find-files "tests" ".\\.scm$")
 +              (("/usr/bin/env gpgscm")
 +               (string-append (getcwd) "/tests/gpgscm/gpgscm")))))
 +        (add-before 'check 'set-home
 +          ;; Some tests require write access to $HOME, otherwise leading to
 +          ;; 'failed to create directory /homeless-shelter/.asy' error.
 +          (lambda _
 +            (setenv "HOME" "/tmp")
              #t)))))
      (home-page "https://gnupg.org/";)
      (synopsis "GNU Privacy Guard")
diff --cc gnu/packages/statistics.scm
index ee6e693,b15f9cf..4df1e24
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@@ -170,9 -176,9 +177,10 @@@ be output in text, PostScript, PDF or H
       `(;; We need not only cairo here, but pango to ensure that tests for the
         ;; "cairo" bitmapType plotting backend succeed.
         ("pango" ,pango)
+        ("coreutils" ,coreutils)
         ("curl" ,curl)
         ("tzdata" ,tzdata)
 +       ("openblas" ,openblas)
         ("gfortran" ,gfortran)
         ("icu4c" ,icu4c)
         ("libjpeg" ,libjpeg)