Merge branch 'master' into staging

This commit is contained in:
Marius Bakke 2019-02-24 21:25:52 +01:00
commit aa51eb2073
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
49 changed files with 567 additions and 299 deletions

View file

@ -764,7 +764,7 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\"
(inherit base-rust)
(inputs
;; Use LLVM 6.0
(alist-replace "llvm" (list llvm)
(alist-replace "llvm" (list llvm-6)
(package-inputs base-rust)))
(arguments
(substitute-keyword-arguments (package-arguments base-rust)