Merge branch 'master' into staging

diff --cc doc/guix.texi
Simple merge

diff --cc gnu/local.mk
Simple merge

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

diff --cc gnu/packages/llvm.scm
index ec79bcc,6dab9c5..2a3754b
--- 1/gnu/packages/llvm.scm
--- 2/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