Merge branch 'master' into core-updates

diff --cc gnu/local.mk
index 0ae2e4e,0575a2f..7bb09fc
--- 1/gnu/local.mk
--- 2/gnu/local.mk
+++ b/gnu/local.mk
@@@ -894,8 -901,8 +894,9 @@@ dist_patch_DATA =                                          
    %D%/packages/patches/luminance-hdr-qt-printer.patch         \
    %D%/packages/patches/lvm2-static-link.patch                 \
    %D%/packages/patches/lxsession-use-gapplication.patch         \
+   %D%/packages/patches/lyx-2.2.3-fix-test.patch                       \
    %D%/packages/patches/mailutils-uninitialized-memory.patch   \
 +  %D%/packages/patches/make-glibc-compat.patch                        \
    %D%/packages/patches/make-impure-dirs.patch                 \
    %D%/packages/patches/mars-install.patch                     \
    %D%/packages/patches/mars-sfml-2.3.patch                    \

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

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

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

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

diff --cc gnu/packages/boost.scm
index f7e90b4,d347674..674877a
--- 1/gnu/packages/boost.scm
--- 2/gnu/packages/boost.scm
+++ b/gnu/packages/boost.scm
@@@ -6,8 -6,7 +6,9 @@@
  ;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
  ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
  ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 +;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
 +;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
+ ;;; Copyright © 2018 Maxim Cournoyer <maxim.cournoyer@gmail.com>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;
@@@ -110,6 -114,52 +114,38 @@@ across a broad spectrum of applications
      (license (license:x11-style "http://www.boost.org/LICENSE_1_0.txt"
                                  "Some components have other similar licences."))))
  
 -(define-public boost-1.66
 -  (package
 -    (inherit boost)
 -    (version "1.66.0")
 -    (source (origin
 -              (method url-fetch)
 -              (uri (string-append
 -                    "mirror://sourceforge/boost/boost/" version "/boost_"
 -                    (string-map (lambda (x) (if (eq? x #\.) #\_ x)) version)
 -                    ".tar.bz2"))
 -              (sha256
 -               (base32
 -                "1aaw48cmimsskzgiclwn0iifp62a5iw9cbqrhfari876af1828ap"))))))
 -
+ (define-public boost-sync
+   (let ((commit "c72891d9b90e2ceb466ec859f640cd012b2d8709")
+         (version "1.55")
+         (revision "1"))
+     (package
+       (name "boost-sync")
+       (version (git-version version revision commit))
+       (source (origin
+                 (method git-fetch)
+                 (uri (git-reference
+                       (url "https://github.com/boostorg/sync.git")
+                       (commit commit)))
+                 (file-name (git-file-name name version))
+                 (sha256
+                  (base32
+                   "197mp5z048vz5kv1m4v3jm447l2gqsyv0rbfz11dz0ns343ihbyx"))))
+       (build-system trivial-build-system)
+       (arguments
+        `(#:modules ((guix build utils))
+          #:builder
+          (begin
+            (use-modules (guix build utils))
+            (let ((source (assoc-ref %build-inputs "source")))
+              (copy-recursively (string-append source "/include")
+                                (string-append %output "/include"))))))
+       (home-page "https://github.com/boostorg/sync")
+       (synopsis "Boost.Sync library")
+       (description "The Boost.Sync library provides mutexes, semaphores, locks
+ and events and other thread related facilities.  Boost.Sync originated from
+ Boost.Thread.")
+       (license (license:x11-style "http://www.boost.org/LICENSE_1_0.txt")))))
+ 
  (define-public mdds
    (package
      (name "mdds")

diff --cc gnu/packages/bootstrap.scm
index f332018,b754b1f..936d6c1
--- 1/gnu/packages/bootstrap.scm
--- 2/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@@ -1,6 -1,6 +1,6 @@@
  ;;; GNU Guix --- Functional package management for GNU
- ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
+ ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
 -;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
 +;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org>
  ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
  ;;;
  ;;; This file is part of GNU Guix.

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

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

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

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

diff --cc gnu/packages/emacs.scm
index f7bf2db,6f13176..0011ee0
--- 1/gnu/packages/emacs.scm
--- 2/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@@ -539,10 -541,8 +543,9 @@@ operations."
               (parameterize ((%emacs emacs))
                 (emacs-generate-autoloads ,name lisp-dir)
                 (setenv "EMACSLOADPATH"
-                        (string-append ":" magit ":" dash))
+                        (string-append ":" magit ":" dash ":" with-editor))
 -               (emacs-batch-eval '(byte-compile-file "magit-svn.el"))))))))
 +               (emacs-batch-eval '(byte-compile-file "magit-svn.el"))))
- 
 +           #t))))
      (home-page "https://github.com/magit/magit-svn")
      (synopsis "Git-SVN extension to Magit")
      (description

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc gnu/packages/libreoffice.scm
index 922c82b,ef40e01..50f44b5
--- 1/gnu/packages/libreoffice.scm
--- 2/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@@ -4,9 -4,9 +4,9 @@@
  ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
  ;;; Copyright © 2017 Alex Griffin <a@ajgrf.com>
  ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
- ;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
+ ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
  ;;; Copyright © 2017 Andy Wingo <wingo@igalia.com>
 -;;; Copyright © 2017 Ludovic Courtès <ludo@gnu.org>
 +;;; Copyright © 2017, 2018 Ludovic Courtès <ludo@gnu.org>
  ;;; Copyright © 2017, 2018 Marius Bakke <mbakke@fastmail.com>
  ;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
  ;;;

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

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

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

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

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

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

diff --cc gnu/packages/messaging.scm
index eb1ab34,b3eff1e..db5407e
--- 1/gnu/packages/messaging.scm
--- 2/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@@ -1403,8 -1406,14 +1403,8 @@@ manual SSL certificate verification."
                (file-name (string-append name "-" version ".tar.gz"))
                (sha256
                 (base32
-                 "1hzwdax4nsz0fncf5bjfza0cn0lc6xsf38y569ql1gg5hvwr6169"))))
+                 "0vxfcyfnhnlaj6spm2b0ljw5i3knbphy6mvzpl5zv9b52ny4b08m"))))
      (build-system gnu-build-system)
 -    (arguments
 -     `(#:phases
 -       (modify-phases %standard-phases
 -         (add-before 'configure 'bootstrap
 -           (lambda _
 -             (zero? (system* "./bootstrap.sh")))))))
      (inputs
       `(("expat" ,expat)
         ("openssl" ,openssl)))

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

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

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

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

diff --cc gnu/packages/package-management.scm
Simple merge

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

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

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

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

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

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

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

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

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

diff --cc gnu/packages/text-editors.scm
Simple merge

diff --cc gnu/packages/tls.scm
index d8ff5a1,79bf884..9143af3
--- 1/gnu/packages/tls.scm
--- 2/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@@ -4,9 -4,9 +4,9 @@@
  ;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
  ;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr>
  ;;; Copyright © 2015 David Thompson <davet@gnu.org>
 -;;; Copyright © 2015, 2016, 2017 Leo Famulari <leo@famulari.name>
 +;;; Copyright © 2015, 2016, 2017, 2018 Leo Famulari <leo@famulari.name>
  ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
- ;;; Copyright © 2016, 2017 Nils Gillmann <ng0@n0.is>
+ ;;; Copyright © 2016, 2017, 2018 Nils Gillmann <ng0@n0.is>
  ;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
  ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
  ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>

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

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

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

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

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

diff --cc gnu/packages/xorg.scm
index 190b4cc,38ce45b..d664850
--- 1/gnu/packages/xorg.scm
--- 2/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@@ -2683,10 -2663,10 +2683,10 @@@ as USB mice."
                 ".tar.bz2"))
          (sha256
            (base32
-             "0yafix56vkqglw243cwb94nv91vbjv12sqh29x1bap0hwd1dclgf"))))
+             "180l2yw8c63cbcs3zk729vx439aig1d7yicpyxj0nmfl4y0kpskj"))))
      (build-system gnu-build-system)
      (inputs `(("mesa" ,mesa)
 -              ("xxf86driproto" ,xf86driproto)
 +              ("xorgproto" ,xorgproto)
                ("xorg-server" ,xorg-server)))
      (native-inputs `(("pkg-config" ,pkg-config)))
      (arguments `(#:configure-flags `("--disable-glamor"))) ; TODO: Enable glamor

diff --cc gnu/system.scm
index eb4b63c,592a0ea..c35615a
--- 1/gnu/system.scm
--- 2/gnu/system.scm
+++ b/gnu/system.scm
@@@ -515,7 -515,9 +515,8 @@@ explicitly appear in OS.
    ;; required for basic administrator tasks.
    (cons* procps psmisc which less zile nano
           pciutils usbutils
-          util-linux inetutils isc-dhcp
 -         ;; temporary package to fix CVE-2018-7738 without a graft
 -         util-linux-2.31.1
++         util-linux
+          inetutils isc-dhcp
           (@ (gnu packages admin) shadow)          ;for 'passwd'
  
           ;; wireless-tools is deprecated in favor of iw, but it's still what