diff options
author | Sophie Taylor <sophie@traumapony.org> | 2015-08-17 20:02:17 +1000 |
---|---|---|
committer | Cray Elliott <MP2E@archlinux.us> | 2015-08-18 02:18:04 -0700 |
commit | 2e416464419f9462b2f55375ce8b9199b843f136 (patch) | |
tree | 74a1320c28d7c2bbce609c85751184ce4cc70e01 /pkgs/development/compilers/llvm/3.5 | |
parent | 807a0e4609c2a4f1e673bff75c31a0617f3ea0c7 (diff) | |
download | nixlib-2e416464419f9462b2f55375ce8b9199b843f136.tar nixlib-2e416464419f9462b2f55375ce8b9199b843f136.tar.gz nixlib-2e416464419f9462b2f55375ce8b9199b843f136.tar.bz2 nixlib-2e416464419f9462b2f55375ce8b9199b843f136.tar.lz nixlib-2e416464419f9462b2f55375ce8b9199b843f136.tar.xz nixlib-2e416464419f9462b2f55375ce8b9199b843f136.tar.zst nixlib-2e416464419f9462b2f55375ce8b9199b843f136.zip |
nixpkgs: llvm v3.5.0 -> v3.5.2
Diffstat (limited to 'pkgs/development/compilers/llvm/3.5')
-rw-r--r-- | pkgs/development/compilers/llvm/3.5/clang.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/3.5/default.nix | 12 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/3.5/dragonegg.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/3.5/libc++/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/3.5/libc++abi/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/3.5/lld.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/3.5/lldb.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/3.5/llvm.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/3.5/polly.nix | 2 |
9 files changed, 17 insertions, 15 deletions
diff --git a/pkgs/development/compilers/llvm/3.5/clang.nix b/pkgs/development/compilers/llvm/3.5/clang.nix index 292154eb67ad..42ca4ba70e4d 100644 --- a/pkgs/development/compilers/llvm/3.5/clang.nix +++ b/pkgs/development/compilers/llvm/3.5/clang.nix @@ -5,7 +5,7 @@ in stdenv.mkDerivation { name = "clang-${version}"; unpackPhase = '' - unpackFile ${fetch "cfe" "12yv3jwdjcbkrx7zjm8wh4jrvb59v8fdw4mnmz3zc1jb00p9k07w"} + unpackFile ${fetch "cfe" "0846h8vn3zlc00jkmvrmy88gc6ql6014c02l4jv78fpvfigmgssg"} mv cfe-${version}.src clang sourceRoot=$PWD/clang unpackFile ${clang-tools-extra_src} diff --git a/pkgs/development/compilers/llvm/3.5/default.nix b/pkgs/development/compilers/llvm/3.5/default.nix index 29e06768a738..f588eb4407b5 100644 --- a/pkgs/development/compilers/llvm/3.5/default.nix +++ b/pkgs/development/compilers/llvm/3.5/default.nix @@ -2,7 +2,7 @@ let callPackage = newScope (self // { inherit stdenv isl version fetch; }); - version = "3.5.0"; + version = "3.5.2"; fetch = fetch_v version; fetch_v = ver: name: sha256: fetchurl { @@ -10,18 +10,18 @@ let inherit sha256; }; - compiler-rt_src = fetch "compiler-rt" "0dl1kbrhz96djsxqr61iw5h788s7ncfpfb7aayixky1bhdaydcx4"; - clang-tools-extra_src = fetch "clang-tools-extra" "0s8zjgxg8bj15nnqcw1cj1zffcralhh7f0gda1famddgg2rvx099"; + compiler-rt_src = fetch "compiler-rt" "1hsdnzzdr5kglz6fnv3lcsjs222zjsy14y8ax9dy6zqysanplbal"; + clang-tools-extra_src = fetch "clang-tools-extra" "01607w6hdf1pjgaapn9fy6smk22i3d4ncqjlhk4xi55ifi6kf6pj"; self = { llvm = callPackage ./llvm.nix rec { - version = "3.5.0"; + version = "3.5.2"; fetch = fetch_v version; inherit compiler-rt_src; }; clang = callPackage ./clang.nix rec { - version = "3.5.0"; + version = "3.5.2"; fetch = fetch_v version; inherit clang-tools-extra_src; }; @@ -37,5 +37,7 @@ let libcxx = callPackage ./libc++ { stdenv = pkgs.clangStdenv; }; libcxxabi = callPackage ./libc++abi { stdenv = pkgs.clangStdenv; }; + + #openmp = callPackage ./openmp {}; }; in self diff --git a/pkgs/development/compilers/llvm/3.5/dragonegg.nix b/pkgs/development/compilers/llvm/3.5/dragonegg.nix index a7d405fd55a8..96d4f9f558c8 100644 --- a/pkgs/development/compilers/llvm/3.5/dragonegg.nix +++ b/pkgs/development/compilers/llvm/3.5/dragonegg.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "dragonegg-${version}"; - src = fetch "dragonegg" "1v1lc9h2nfk3lsk9sx1k4ckwddz813hqjmlp2bx2kwxx9hw364ar"; + src = fetch "dragonegg" "1va4wv2b1dj0dpzsksnpnd0jic52q7pqj79w3m9jwdb58h7104dw"; # The gcc the plugin will be built for (the same used building dragonegg) GCC = "gcc"; diff --git a/pkgs/development/compilers/llvm/3.5/libc++/default.nix b/pkgs/development/compilers/llvm/3.5/libc++/default.nix index a23daf4f14ae..7b1624d530b8 100644 --- a/pkgs/development/compilers/llvm/3.5/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.5/libc++/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchurl, cmake, libcxxabi, fixDarwinDylibNames }: -let version = "3.5.0"; in +let version = "3.5.2"; in stdenv.mkDerivation rec { name = "libc++-${version}"; src = fetchurl { url = "http://llvm.org/releases/${version}/libcxx-${version}.src.tar.xz"; - sha256 = "1h5is2jd802344kddm45jcm7bra51llsiv9r34h0rrb3ba2dlic0"; + sha256 = "0irnl54fwzh2hzn9x4jfvnfyq5kd0zn0iwbzdivgwhqzw6fjdwdv"; }; # instead of allowing libc++ to link with /usr/lib/libc++abi.dylib, diff --git a/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix b/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix index c84ce2a44354..963caf809708 100644 --- a/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix +++ b/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix @@ -1,7 +1,7 @@ { stdenv, cmake, fetchurl, libcxx, libunwind, llvm }: let - version = "3.5.0"; + version = "3.5.2"; cmakeLists = fetchurl { name = "CMakeLists.txt"; url = "http://llvm.org/svn/llvm-project/libcxxabi/trunk/CMakeLists.txt?p=217324"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://llvm.org/releases/${version}/libcxxabi-${version}.src.tar.xz"; - sha256 = "1ndcpw3gfrzh7m1jac2qadhkrqgvb65cns69j9niydyj5mmbxijk"; + sha256 = "1c6rv0zx0na1w4hdmdfq2f6nj7limb7d1krrknwajxxkcn4yws92"; }; buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin) libunwind; diff --git a/pkgs/development/compilers/llvm/3.5/lld.nix b/pkgs/development/compilers/llvm/3.5/lld.nix index 6bd8c029231e..b1047f8679ec 100644 --- a/pkgs/development/compilers/llvm/3.5/lld.nix +++ b/pkgs/development/compilers/llvm/3.5/lld.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "lld-${version}"; - src = fetch "lld" "1sd4scqynryfrmcc4h0ljgwn2dgjmbbmf38z50ya6l0janpd2nxx"; + src = fetch "lld" "1hpqawg1sc8mdqxqaxqmlzbrn69w1pkj8rxhjgqgmwra6c0xky89"; preUnpack = '' # !!! Hopefully won't be needed for 3.5 diff --git a/pkgs/development/compilers/llvm/3.5/lldb.nix b/pkgs/development/compilers/llvm/3.5/lldb.nix index 574d706a3fd5..1dad5227d645 100644 --- a/pkgs/development/compilers/llvm/3.5/lldb.nix +++ b/pkgs/development/compilers/llvm/3.5/lldb.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { name = "lldb-${version}"; - src = fetch "lldb" "0h8cmjrhjhigk7k2qll1pcf6jfgmbdzkzfz2i048pkfg851s0x44"; + src = fetch "lldb" "0ffi9jn4k3yd0hvxs1v4n710x8siq21lb49v3351d7j5qinrpgi7"; patchPhase = '' sed -i 's|/usr/bin/env||' \ diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix index b569997acc66..395843bf0d8f 100644 --- a/pkgs/development/compilers/llvm/3.5/llvm.nix +++ b/pkgs/development/compilers/llvm/3.5/llvm.nix @@ -15,7 +15,7 @@ }: let - src = fetch "llvm" "00swb43mzlvda8306arlg2jw7g6k3acwfccgf1k4c2pgd3rrkq98"; + src = fetch "llvm" "0xf5q17kkxsrm2gsi93h4pwlv663kji73r2g4asb97klsmb626a4"; in stdenv.mkDerivation rec { name = "llvm-${version}"; diff --git a/pkgs/development/compilers/llvm/3.5/polly.nix b/pkgs/development/compilers/llvm/3.5/polly.nix index 03bfe0d154b5..c943c790ea22 100644 --- a/pkgs/development/compilers/llvm/3.5/polly.nix +++ b/pkgs/development/compilers/llvm/3.5/polly.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "polly-${version}"; - src = fetch "polly" "1rqflmgzg1vzjm0r32c5ck8x3q0qm3g0hh8ggbjazh6x7nvmy6ll"; + src = fetch "polly" "1s6v54czmgq626an4yk2k34lrzkwmz1bjrbiafh7j23yc2w4nalx"; patches = [ ./polly-separate-build.patch ]; |