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

[guix-commits]

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

commit c57d649de380da890f296428b85564cbc527bbad
Merge: 69c2e01 9b42918
Author: Marius Bakke <address@hidden>
AuthorDate: Fri Apr 24 17:28:11 2020 +0200

    Merge branch 'master' into core-updates

 configure.ac                                       |    2 +
 doc/local.mk                                       |   16 +-
 gnu/local.mk                                       |    2 +
 gnu/packages/aux-files/run-in-namespace.c          |   10 +-
 gnu/packages/cran.scm                              |  242 +++
 gnu/packages/datamash.scm                          |    4 +-
 gnu/packages/datastructures.scm                    |    4 +-
 gnu/packages/dictionaries.scm                      |   16 +-
 gnu/packages/fonts.scm                             |    3 +
 gnu/packages/linux.scm                             |   12 +-
 gnu/packages/llvm.scm                              |   54 +-
 gnu/packages/music.scm                             |   80 +
 gnu/packages/networking.scm                        |    5 +-
 gnu/packages/package-management.scm                |    6 +-
 gnu/packages/patches/biber-sortinithash.patch      | 1657 ++++++++++++++++++++
 .../patches/clang-10.0-libc-search-path.patch      |   84 +
 gnu/packages/radio.scm                             |  118 ++
 gnu/packages/tex.scm                               |   61 +-
 gnu/packages/web.scm                               |   10 +-
 guix/build/compile.scm                             |    9 +-
 guix/git-download.scm                              |    4 +-
 guix/scripts/package.scm                           |    2 +
 tests/guix-pack-relocatable.sh                     |    6 +-
 23 files changed, 2351 insertions(+), 56 deletions(-)

diff --cc gnu/local.mk
index 7c117b7,66a9c76..2780434
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -807,11 -806,9 +808,12 @@@ dist_patch_DATA =                                
                
    %D%/packages/patches/clang-6.0-libc-search-path.patch               \
    %D%/packages/patches/clang-7.0-libc-search-path.patch               \
    %D%/packages/patches/clang-9.0-libc-search-path.patch               \
+   %D%/packages/patches/clang-10.0-libc-search-path.patch      \
    %D%/packages/patches/clang-runtime-asan-build-fixes.patch   \
    %D%/packages/patches/clang-runtime-esan-build-fixes.patch   \
 +  %D%/packages/patches/clang-runtime-9-libsanitizer-mode-field.patch  \
 +  %D%/packages/patches/clang-runtime-3.9-libsanitizer-mode-field.patch        
\
 +  %D%/packages/patches/clang-runtime-3.8-libsanitizer-mode-field.patch        
\
    %D%/packages/patches/classpath-aarch64-support.patch                \
    %D%/packages/patches/clementine-fix-sqlite.patch            \
    %D%/packages/patches/clementine-remove-crypto++-dependency.patch    \
diff --cc gnu/packages/llvm.scm
index 9ffb31c,d6c519b..bda002e
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@@ -95,9 -94,8 +95,9 @@@ as \"x86_64-linux\".
        (uri (llvm-download-uri "llvm" version))
        (sha256
         (base32
-         "16hwp3qa54c3a3v7h8nlw0fh5criqh0hlr1skybyk0cz70gyx880"))))
+         "1pwgm6cr0xr5a0hrbqs1zvsvvjvy0yq1y47c96804wcs795s90yz"))))
      (build-system cmake-build-system)
 +    (outputs '("out" "opt-viewer"))
      (native-inputs
       `(("python" ,python-2) ;bytes->str conversion in clang>=3.7 needs 
python-2
         ("perl"   ,perl)))
@@@ -405,14 -368,38 +405,39 @@@ output), and Binutils."
                ("libc-debug" ,glibc "debug")
                ("libc-static" ,glibc "static")))))
  
- (define-public clang-runtime
+ (define-public clang-runtime-10
+   (clang-runtime-from-llvm
+    llvm-10
+    "0x9c531k6ww21s2mkdwqx1vbdjmx6d4wmfb8gdbj0wqa796sczba"))
+ 
+ (define-public clang-10
+   (clang-from-llvm llvm-10 clang-runtime-10
+                    "08fbxa2a0kr3ni35ckppj0kyvlcyaywrhpqwcdrdy0z900mhcnw8"
+                    #:patches '("clang-10.0-libc-search-path.patch")))
+ 
+ (define-public clang-toolchain-10
+   (make-clang-toolchain clang-10))
+ 
+ (define-public llvm-9
+   (package
+     (inherit llvm-10)
+     (version "9.0.1")
+     (source
+      (origin
+        (method url-fetch)
+        (uri (llvm-download-uri "llvm" version))
+        (sha256
+         (base32
+          "16hwp3qa54c3a3v7h8nlw0fh5criqh0hlr1skybyk0cz70gyx880"))))))
+ 
+ (define-public clang-runtime-9
    (clang-runtime-from-llvm
-    llvm
+    llvm-9
 -   "0xwh79g3zggdabxgnd0bphry75asm1qz7mv3hcqihqwqr6aspgy2"))
 +   "0xwh79g3zggdabxgnd0bphry75asm1qz7mv3hcqihqwqr6aspgy2"
 +   '("clang-runtime-9-libsanitizer-mode-field.patch")))
  
- (define-public clang
-   (clang-from-llvm llvm clang-runtime
+ (define-public clang-9
+   (clang-from-llvm llvm-9 clang-runtime-9
                     "0ls2h3iv4finqyflyhry21qhc9cm9ga7g1zq21020p065qmm2y2p"
                     #:patches '("clang-9.0-libc-search-path.patch")))
  
diff --cc gnu/packages/tex.scm
index 3f210cd,91d3ee6..464dbd1
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@@ -6,9 -6,9 +6,9 @@@
  ;;; Copyright © 2016, 2018, 2019 Efraim Flashner <address@hidden>
  ;;; Copyright © 2016 Federico Beffa <address@hidden>
  ;;; Copyright © 2016 Thomas Danckaert <address@hidden>
- ;;; Copyright © 2016, 2017, 2018, 2019 Ricardo Wurmus <address@hidden>
+ ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus <address@hidden>
  ;;; Copyright © 2017 Leo Famulari <address@hidden>
 -;;; Copyright © 2017 Marius Bakke <address@hidden>
 +;;; Copyright © 2017, 2020 Marius Bakke <address@hidden>
  ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <address@hidden>
  ;;; Copyright © 2018 Danny Milosavljevic <address@hidden>
  ;;; Copyright © 2018 Arun Isaac <address@hidden>