aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2018-07-28 21:23:11 +0200
committerMarius Bakke <mbakke@fastmail.com>2018-07-28 21:23:11 +0200
commit148df6052c983598a26620b660b90de93fd6039a (patch)
treef53ec446f9afeef629617afdf28454c18be90668
parent0333582477bfd1160a640bd35d08f59feaada607 (diff)
downloadgnu-guix-148df6052c983598a26620b660b90de93fd6039a.tar
gnu-guix-148df6052c983598a26620b660b90de93fd6039a.tar.gz
Revert "Revert "gnu: llvm: Update to 6.0.1.""
This reverts commit bb8221d41cc7b2dc928d1c9501946d3dc6063c4b.
-rw-r--r--gnu/packages/llvm.scm9
1 files changed, 5 insertions, 4 deletions
diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
index 98592ad090..add7f1b40c 100644
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@ -6,6 +6,7 @@
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Roel Janssen <roel@gnu.org>
;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -41,7 +42,7 @@
(define-public llvm
(package
(name "llvm")
- (version "6.0.0")
+ (version "6.0.1")
(source
(origin
(method url-fetch)
@@ -49,7 +50,7 @@
version "/llvm-" version ".src.tar.xz"))
(sha256
(base32
- "0224xvfg6h40y5lrbnb9qaq3grmdc5rg00xq03s1wxjfbf8krx8z"))))
+ "1qpls3vk85lydi5b4axl0809fv932qgsqgdgrk098567z4jc7mmn"))))
(build-system cmake-build-system)
(native-inputs
`(("python" ,python-2) ;bytes->str conversion in clang>=3.7 needs python-2
@@ -243,11 +244,11 @@ code analysis tools.")
(define-public clang-runtime
(clang-runtime-from-llvm
llvm
- "16m7rvh3w6vq10iwkjrr1nn293djld3xm62l5zasisaprx117k6h"))
+ "1fcr3jn24yr8lh36nc0c4ikli4744i2q9m1ik67p1jymwwaixkgl"))
(define-public clang
(clang-from-llvm llvm clang-runtime
- "0cnznvfyl3hgbg8gj58pmwf0pvd2sv5k3ccbivy6q6ggv7c6szg0"
+ "0rxn4rh7rrnsqbdgp4gzc8ishbkryhpl1kd3mpnxzpxxhla3y93w"
#:patches '("clang-6.0-libc-search-path.patch")))
(define-public llvm-3.9.1