guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

03/03: gnu: rust: use llvm@8


From: guix-commits
Subject: 03/03: gnu: rust: use llvm@8
Date: Fri, 28 Jun 2019 21:44:59 -0400 (EDT)

ipetkov pushed a commit to branch master
in repository guix.

commit f5de2b9a3e0070ec431e01c279192e6d93d6a1c8
Author: Ivan Petkov <address@hidden>
Date:   Mon Jun 17 22:10:52 2019 -0700

    gnu: rust: use llvm@8
    
    * gnu/packages/llvm.scm (llvm): Rename to...
    (llvm-8): ...this.
    (llvm): New variable.
    * gnu/packages/rust.scm (rust)[inputs]: Use llvm-8
---
 gnu/packages/llvm.scm | 4 +++-
 gnu/packages/rust.scm | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
index faf9e40..0315740 100644
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@ -48,7 +48,7 @@
   #:use-module (gnu packages python)
   #:use-module (gnu packages xml))
 
-(define-public llvm
+(define-public llvm-8
   (package
     (name "llvm")
     (version "8.0.0")
@@ -99,6 +99,8 @@ languages is in development.  The compiler infrastructure 
includes mirror sets
 of programming tools as well as libraries with equivalent functionality.")
     (license license:ncsa)))
 
+(define-public llvm llvm-8)
+
 (define* (clang-runtime-from-llvm llvm hash
                                   #:optional (patches '()))
   (package
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index c83c8a6..9444d8b 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -1056,6 +1056,9 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\"
            "0bbizy6b7002v1rdhrxrf5gijclbyizdhkglhp81ib3bf5x66kas")))
     (package
       (inherit base-rust)
+      (inputs
+       (alist-replace "llvm" (list llvm-8)
+                      (package-inputs base-rust)))
       (arguments
        (substitute-keyword-arguments (package-arguments base-rust)
          ((#:phases phases)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]