01/01: Merge branch 'master' into staging

[guix-commits]

mbakke pushed a commit to branch staging
in repository guix.

commit 2bfcdbce51cf09a856ac0e43bb1a554b0110e1df
Merge: e99d036 10275b7
Author: Marius Bakke <address@hidden>
Date:   Wed Dec 26 16:03:09 2018 +0100

    Merge branch 'master' into staging

 doc/guix.texi                                  |  81 +++++++++++--
 gnu/local.mk                                   |   1 +
 gnu/packages/audio.scm                         |  76 ++++++++----
 gnu/packages/dictionaries.scm                  |  34 ++++--
 gnu/packages/education.scm                     |  24 ++--
 gnu/packages/file.scm                          |   9 ++
 gnu/packages/fonts.scm                         |  22 ++++
 gnu/packages/gnupg.scm                         |  13 +-
 gnu/packages/kde-frameworks.scm                |  30 +----
 gnu/packages/llvm.scm                          |   6 +-
 gnu/packages/ocaml.scm                         |  55 +++++++++
 gnu/packages/package-management.scm            |   6 +-
 gnu/packages/parallel.scm                      |   4 +-
 gnu/packages/patches/file-CVE-2018-10360.patch |  27 +++++
 gnu/packages/photo.scm                         |   4 +-
 gnu/packages/python-web.scm                    |  11 +-
 gnu/packages/python.scm                        |   6 +-
 gnu/packages/wine.scm                          |   8 +-
 gnu/packages/wm.scm                            |  43 +++++++
 gnu/services/messaging.scm                     |  90 +++++++++++++-
 gnu/system/examples/vm-image.tmpl              |   2 +
 gnu/tests/messaging.scm                        |  54 ++++++++-
 guix/inferior.scm                              |  28 +++--
 guix/scripts/lint.scm                          |  39 ++++++
 guix/scripts/offload.scm                       | 157 +++++++++++++------------
 guix/scripts/refresh.scm                       |  55 +++++++++
 guix/ssh.scm                                   |  42 +++++--
 tests/lint.scm                                 |  28 +++++
 28 files changed, 753 insertions(+), 202 deletions(-)

diff --cc gnu/packages/llvm.scm
index ec79bcc,6dab9c5..2a3754b
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@@ -108,8 -108,28 +108,8 @@@ of programming tools as well as librari
                            version "/llvm-" version ".src.tar.xz"))
        (sha256
         (base32
-         "08p27wv1pr9ql2zc3f3qkkymci46q7myvh8r5ijippnbwr2gihcb"))))))
+         "16s196wqzdw4pmri15hadzqgdi926zln3an2viwyq0kini6zr3d3"))))))
  
 -;; FIXME: This package is here to prevent many rebuilds on x86_64 and i686
 -;; from commit fc9dbf41311d99d0fd8befc789ea7c0e35911890.  Update users of
 -;; this in the next rebuild cycle.
 -(define-public llvm-without-rtti
 -  (package
 -    (inherit llvm)
 -    (arguments
 -     `(#:configure-flags '("-DCMAKE_SKIP_BUILD_RPATH=FALSE"
 -                           "-DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE"
 -                           "-DBUILD_SHARED_LIBS:BOOL=TRUE"
 -                           "-DLLVM_ENABLE_FFI:BOOL=TRUE"
 -                           "-DLLVM_INSTALL_UTILS=ON")
 -       #:build-type "Release"
 -       #:phases (modify-phases %standard-phases
 -                  (add-before 'build 'shared-lib-workaround
 -                    (lambda _
 -                      (setenv "LD_LIBRARY_PATH"
 -                              (string-append (getcwd) "/lib"))
 -                      #t)))))))
 -
  (define* (clang-runtime-from-llvm llvm hash
                                    #:optional (patches '()))
    (package