Merge branch 'master' into core-updates

diff --cc Makefile.am
Simple merge

diff --cc gnu/local.mk
index fdb6cb1,240554f..4490b2d
--- 1/gnu/local.mk
--- 2/gnu/local.mk
+++ b/gnu/local.mk
@@@ -905,9 -925,8 +906,10 @@@ dist_patch_DATA =                                         
    %D%/packages/patches/netsurf-system-utf8proc.patch          \
    %D%/packages/patches/netsurf-y2038-tests.patch              \
    %D%/packages/patches/netsurf-longer-test-timeout.patch      \
 +  %D%/packages/patches/nfs-utils-missing-headers.patch                \
    %D%/packages/patches/ngircd-handle-zombies.patch            \
 +  %D%/packages/patches/ninja-zero-mtime.patch                 \
+   %D%/packages/patches/node-test-http2-server-rst-stream.patch        \
    %D%/packages/patches/nss-increase-test-timeout.patch                \
    %D%/packages/patches/nss-pkgconfig.patch                    \
    %D%/packages/patches/nvi-assume-preserve-path.patch         \

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

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

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

diff --cc gnu/packages/cups.scm
index 974ef1c,fdfe944..89c58f8
--- 1/gnu/packages/cups.scm
--- 2/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@@ -5,7 -5,7 +5,7 @@@
  ;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
  ;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
  ;;; Copyright © 2017 Mark H Weaver <mhw@netris.org>
- ;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
 -;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
++;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;

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

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

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

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

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

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

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

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

diff --cc gnu/packages/image-viewers.scm
Simple merge

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

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

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

diff --cc gnu/packages/ncurses.scm
index dcf7bee,3d01fe6..5482612
--- 1/gnu/packages/ncurses.scm
--- 2/gnu/packages/ncurses.scm
+++ b/gnu/packages/ncurses.scm
@@@ -5,7 -5,7 +5,8 @@@
  ;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
  ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
  ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
 +;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
+ ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;

diff --cc gnu/packages/package-management.scm
index 59213c5,24116f9..bf1ce4b
--- 1/gnu/packages/package-management.scm
--- 2/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@@ -22,52 -22,50 +22,51 @@@
  ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
  
  (define-module (gnu packages package-management)
-   #:use-module (guix packages)
-   #:use-module (guix download)
-   #:use-module (guix git-download)
-   #:use-module (guix gexp)
-   #:use-module (guix utils)
-   #:use-module (guix build-system gnu)
-   #:use-module (guix build-system python)
-   #:use-module (guix build-system emacs)
-   #:use-module ((guix licenses) #:select (gpl2+ gpl3+ agpl3+ lgpl2.1+ asl2.0
-                                           bsd-3 silofl1.1))
    #:use-module (gnu packages)
-   #:use-module (gnu packages guile)
-   #:use-module (gnu packages file)
+   #:use-module (gnu packages acl)
+   #:use-module (gnu packages autotools)
    #:use-module (gnu packages backup)
+   #:use-module (gnu packages bdw-gc)
 +  #:use-module (gnu packages bootstrap)          ;for 'bootstrap-guile-origin'
    #:use-module (gnu packages check)
    #:use-module (gnu packages compression)
-   #:use-module (gnu packages gnupg)
+   #:use-module (gnu packages cpio)
+   #:use-module (gnu packages curl)
    #:use-module (gnu packages databases)
-   #:use-module (gnu packages graphviz)
-   #:use-module (gnu packages pkg-config)
-   #:use-module (gnu packages autotools)
+   #:use-module (gnu packages file)
    #:use-module (gnu packages gettext)
+   #:use-module (gnu packages gnupg)
+   #:use-module (gnu packages gnuzilla)
+   #:use-module (gnu packages graphviz)
+   #:use-module (gnu packages guile)
    #:use-module (gnu packages lisp)
-   #:use-module (gnu packages texinfo)
+   #:use-module (gnu packages man)
    #:use-module (gnu packages nettle)
+   #:use-module (gnu packages patchutils)
    #:use-module (gnu packages perl)
    #:use-module (gnu packages perl-check)
-   #:use-module (gnu packages curl)
-   #:use-module (gnu packages web)
-   #:use-module (gnu packages man)
-   #:use-module (gnu packages bdw-gc)
-   #:use-module (gnu packages patchutils)
+   #:use-module (gnu packages pkg-config)
+   #:use-module (gnu packages popt)
    #:use-module (gnu packages python)
    #:use-module (gnu packages python-web)
-   #:use-module (gnu packages popt)
-   #:use-module (gnu packages gnuzilla)
-   #:use-module (gnu packages cpio)
+   #:use-module (gnu packages serialization)
+   #:use-module (gnu packages ssh)
+   #:use-module (gnu packages texinfo)
    #:use-module (gnu packages time)
    #:use-module (gnu packages tls)
-   #:use-module (gnu packages ssh)
    #:use-module (gnu packages vim)
-   #:use-module (gnu packages serialization)
-   #:use-module (gnu packages acl)
-   #:use-module (srfi srfi-1)
-   #:use-module (ice-9 match))
+   #:use-module (gnu packages web)
+   #:use-module (guix build-system emacs)
+   #:use-module (guix build-system gnu)
+   #:use-module (guix build-system python)
+   #:use-module (guix download)
+   #:use-module (guix gexp)
+   #:use-module (guix git-download)
+   #:use-module ((guix licenses) #:prefix license:)
+   #:use-module (guix packages)
+   #:use-module (guix utils)
+   #:use-module (ice-9 match)
+   #:use-module (srfi srfi-1))
  
  (define (boot-guile-uri arch)
    "Return the URI for the bootstrap Guile tarball for ARCH."

diff --cc gnu/packages/pcre.scm
index c84f07c,0cfde15..ee853d5
--- 1/gnu/packages/pcre.scm
--- 2/gnu/packages/pcre.scm
+++ b/gnu/packages/pcre.scm
@@@ -70,8 -71,23 +70,8 @@@ pattern matching using the same syntax 
  own native API, as well as a set of wrapper functions that correspond to the
  POSIX regular expression API.")
     (license license:bsd-3)
-    (home-page "http://www.pcre.org/")))
+    (home-page "https://www.pcre.org/")))
  
 -(define pcre-8.41
 -  (package
 -    (inherit pcre)
 -    (version "8.41")
 -    (source (origin
 -              (method url-fetch)
 -              (uri (list (string-append "mirror://sourceforge/pcre/pcre/"
 -                                        version "/pcre-" version ".tar.bz2")
 -                         (string-append "ftp://ftp.csx.cam.ac.uk"
 -                                        "/pub/software/programming/pcre/"
 -                                        "pcre-" version ".tar.bz2")))
 -              (sha256
 -               (base32
 -                "0c5m469p5pd7jip621ipq6hbgh7128lzh7xndllfgh77ban7wb76"))))))
 -
  (define-public pcre2
    (package
      (name "pcre2")

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

diff --cc gnu/packages/python-crypto.scm
Simple merge

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

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

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

diff --cc gnu/packages/tls.scm
index 09e65d9,bee2d09..a72feb4
--- 1/gnu/packages/tls.scm
--- 2/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@@ -388,8 -396,27 +388,8 @@@ required structures."
     (description
      "OpenSSL is an implementation of SSL/TLS.")
     (license license:openssl)
-    (home-page "http://www.openssl.org/")))
+    (home-page "https://www.openssl.org/")))
  
 -;; Fixes CVE-2017-3735, CVE-2017-3736, CVE-2017-3737, and CVE-2017-3738.
 -;; See <https://www.openssl.org/news/cl102.txt>.
 -(define-public openssl-1.0.2n
 -  (package
 -    (inherit openssl)
 -    (version "1.0.2n")
 -    (source (origin
 -              (inherit (package-source openssl))
 -              (uri (list (string-append "https://www.openssl.org/source/openssl-"
 -                                        version ".tar.gz")
 -                         (string-append "ftp://ftp.openssl.org/source/openssl-"
 -                                        version ".tar.gz")
 -                         (string-append "ftp://ftp.openssl.org/source/old/"
 -                                        (string-trim-right version char-set:letter)
 -                                        "/openssl-" version ".tar.gz")))
 -              (sha256
 -               (base32
 -                "1zm82pyq5a9jm10q6iv7d3dih3xwjds4x30fqph3k317byvsn2rp"))))))
 -
  (define-public openssl-next
    (package
      (inherit openssl)

diff --cc gnu/packages/valgrind.scm
index d23cd73,21556a9..6c06b24
--- 1/gnu/packages/valgrind.scm
--- 2/gnu/packages/valgrind.scm
+++ b/gnu/packages/valgrind.scm
@@@ -38,9 -39,8 +39,9 @@@
                                   version ".tar.bz2"))
               (sha256
                (base32
-                "18bnrw9b1d55wi1wnl68n25achsp9w48n51n1xw4fwjjnaal7jk7"))
+                "0fqc3684grrbxwsic1rc5ryxzxmigzjx9p5vf3lxa37h0gpq0rnp"))
 -             (patches (search-patches "valgrind-enable-arm.patch"))))
 +             (patches (search-patches "valgrind-enable-arm.patch"
 +                                      "valgrind-glibc-compat.patch"))))
      (build-system gnu-build-system)
      (outputs '("doc"                              ;16 MB
                 "out"))

diff --cc gnu/packages/version-control.scm
Simple merge

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

diff --cc gnu/packages/xiph.scm
index a0cdd0d,4097a74..3a9b989
--- 1/gnu/packages/xiph.scm
--- 2/gnu/packages/xiph.scm
+++ b/gnu/packages/xiph.scm
@@@ -102,8 -102,16 +103,8 @@@ polyphonic) audio and music at fixed an
  128 kbps/channel.")
     (license (license:non-copyleft "file://COPYING"
                                 "See COPYING in the distribution."))
-    (home-page "http://xiph.org/vorbis/")))
+    (home-page "https://xiph.org/vorbis/")))
  
 -(define libvorbis/fixed
 -  (package
 -    (inherit libvorbis)
 -    (source (origin
 -              (inherit (package-source libvorbis))
 -              (patches (search-patches "libvorbis-CVE-2017-14633.patch"
 -                                       "libvorbis-CVE-2017-14632.patch"))))))
 -
  (define libtheora
    (package
      (name "libtheora")

diff --cc gnu/packages/xml.scm
index 40aafcf,eccef0d..200de67
--- 1/gnu/packages/xml.scm
--- 2/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@@ -127,8 -143,23 +127,8 @@@ hierarchical form with variable field l
  project (but it is usable outside of the Gnome platform).")
      (license license:x11)))
  
 -(define libxml2/fixed
 -  (package
 -    (inherit libxml2)
 -    (source
 -     (origin
 -       (inherit (package-source libxml2))
 -       (patches
 -        (append (origin-patches (package-source libxml2))
 -        (search-patches "libxml2-CVE-2017-0663.patch"
 -                        "libxml2-CVE-2017-7375.patch"
 -                        "libxml2-CVE-2017-7376.patch"
 -                        "libxml2-CVE-2017-9047+CVE-2017-9048.patch"
 -                        "libxml2-CVE-2017-9049+CVE-2017-9050.patch"
 -                        "libxml2-CVE-2017-15412.patch")))))))
 -
  (define-public python-libxml2
-   (package (inherit libxml2)
+   (package/inherit libxml2
      (name "python-libxml2")
      (build-system python-build-system)
      (arguments

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

diff --cc guix/packages.scm
Simple merge