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

[Mark H. Weaver]

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

commit aedc6e9fc952665e666f2febfc0b37235ad850ff
Merge: 69d5909 f1f6f22
Author: Mark H Weaver <address@hidden>
Date:   Tue May 8 18:45:39 2018 -0400

    Merge branch 'master' into core-updates

 doc/guix.texi                                      |   4 +-
 gnu/local.mk                                       |   2 +
 gnu/packages/admin.scm                             | 121 ++++++++++++++++++++-
 gnu/packages/emacs.scm                             |  43 ++------
 gnu/packages/fonts.scm                             |   2 +-
 gnu/packages/game-development.scm                  |   3 +-
 gnu/packages/games.scm                             |  39 ++-----
 gnu/packages/gcc.scm                               |  12 +-
 gnu/packages/gnome.scm                             |   4 +-
 gnu/packages/linux.scm                             |   1 +
 gnu/packages/mail.scm                              |   2 +-
 gnu/packages/man.scm                               |  11 +-
 gnu/packages/messaging.scm                         |  47 ++++++++
 gnu/packages/mpd.scm                               |   4 +-
 gnu/packages/networking.scm                        |  11 +-
 gnu/packages/patches/strace-kernel-4.16.patch      |  92 ++++++++++++++++
 .../patches/wesnoth-fix-std-bad-cast.patch         |  67 ++++++++++++
 gnu/packages/upnp.scm                              |   4 +-
 gnu/packages/webkit.scm                            |   4 +-
 gnu/packages/wget.scm                              |   4 +-
 guix/scripts/pack.scm                              |  72 ++++++------
 guix/self.scm                                      |  27 ++++-
 tests/guix-pack.sh                                 |  20 +++-
 23 files changed, 464 insertions(+), 132 deletions(-)

diff --cc gnu/packages/fonts.scm
index 7e15537,19597f0..031df7f
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@@ -137,9 -137,8 +137,9 @@@ TrueType (TTF) files."
             (lambda* (#:key outputs #:allow-other-keys)
               (let ((conf-dir (string-append (assoc-ref outputs "out")
                                              "/share/fontconfig/conf.avail")))
 -               (copy-recursively "fontconfig" conf-dir)))))))
 +               (copy-recursively "fontconfig" conf-dir)
 +               #t))))))
-     (home-page "http://dejavu-fonts.org/";)
+     (home-page "https://dejavu-fonts.github.io/";)
      (synopsis "Vera font family derivate with additional characters")
      (description "DejaVu provides an expanded version of the Vera font family
  aiming for quality and broader Unicode coverage while retaining the original
diff --cc gnu/packages/gcc.scm
index 741cfab,ba2fce6..5012d9a
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@@ -474,18 -467,26 +474,28 @@@ Go.  It also includes runtime support l
                ;; This can be removed when gcc-6.5.0 is released.
                ;; https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81712
                (snippet
 -               '(for-each
 -                  (lambda (dir)
 -                    (substitute* (string-append "libgcc/config/"
 -                                                dir "/linux-unwind.h")
 -                      (("struct ucontext") "ucontext_t")))
 -                  '("aarch64" "alpha" "bfin" "i386" "m68k" "nios2"
 -                    "pa" "sh" "tilepro" "xtensa")))))
 +               '(begin
 +                  (for-each
 +                   (lambda (dir)
 +                     (substitute* (string-append "libgcc/config/"
 +                                                 dir "/linux-unwind.h")
 +                       (("struct ucontext") "ucontext_t")))
 +                   '("aarch64" "alpha" "bfin" "i386" "m68k" "nios2"
 +                     "pa" "sh" "tilepro" "xtensa"))
 +                  #t))))
      (inputs
       `(("isl" ,isl)
-        ,@(package-inputs gcc-4.7)))))
+        ,@(package-inputs gcc-4.7)))
+ 
+     (native-search-paths
+      ;; We have to use 'CPATH' for GCC > 5, not 'C_INCLUDE_PATH' & co., due to
+      ;; <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129>.
+      (list (search-path-specification
+             (variable "CPATH")
+             (files '("include")))
+            (search-path-specification
+             (variable "LIBRARY_PATH")
+             (files '("lib" "lib64")))))))
  
  (define-public gcc-7
    (package
diff --cc gnu/packages/man.scm
index 046b0e3,ca6fd35..58e26d8
--- a/gnu/packages/man.scm
+++ b/gnu/packages/man.scm
@@@ -80,9 -79,8 +79,9 @@@ a flexible and convenient way."
                               (("#! /bin/sh")
                                (string-append "#!" (which "sh")))))
                           (remove file-is-directory?
 -                                 (find-files "src/tests" ".*"))))))
 +                                 (find-files "src/tests" ".*")))
 +               #t)))
-          (add-after 'unpack 'patch-absolute-paths
+          (add-after 'unpack 'patch-iconv-path
             (lambda* (#:key inputs #:allow-other-keys)
               (substitute* "src/man.c"
                 (("\"iconv\"")