public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixpkgs: llvm v3.5.0 -> v3.5.2

Browse Source
This commit is contained in:
Sophie Taylor 2015-08-17 20:02:17 +10:00 committed by Cray Elliott
parent 807a0e4609
commit 2e41646441
10 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/llvm/3.5/clang.nix
View File

@ -5,7 +5,7 @@ in stdenv.mkDerivation {
name = "clang-${version}"; name = "clang-${version}";
unpackPhase = '' unpackPhase = ''
unpackFile ${fetch "cfe" "12yv3jwdjcbkrx7zjm8wh4jrvb59v8fdw4mnmz3zc1jb00p9k07w"} unpackFile ${fetch "cfe" "0846h8vn3zlc00jkmvrmy88gc6ql6014c02l4jv78fpvfigmgssg"}
mv cfe-${version}.src clang mv cfe-${version}.src clang
sourceRoot=$PWD/clang sourceRoot=$PWD/clang
unpackFile ${clang-tools-extra_src} unpackFile ${clang-tools-extra_src}

12
pkgs/development/compilers/llvm/3.5/default.nix
View File

@ -2,7 +2,7 @@
let let
callPackage = newScope (self // { inherit stdenv isl version fetch; }); callPackage = newScope (self // { inherit stdenv isl version fetch; });
version = "3.5.0"; version = "3.5.2";
fetch = fetch_v version; fetch = fetch_v version;
fetch_v = ver: name: sha256: fetchurl { fetch_v = ver: name: sha256: fetchurl {
@ -10,18 +10,18 @@ let
inherit sha256; inherit sha256;
}; };
compiler-rt_src = fetch "compiler-rt" "0dl1kbrhz96djsxqr61iw5h788s7ncfpfb7aayixky1bhdaydcx4"; compiler-rt_src = fetch "compiler-rt" "1hsdnzzdr5kglz6fnv3lcsjs222zjsy14y8ax9dy6zqysanplbal";
clang-tools-extra_src = fetch "clang-tools-extra" "0s8zjgxg8bj15nnqcw1cj1zffcralhh7f0gda1famddgg2rvx099"; clang-tools-extra_src = fetch "clang-tools-extra" "01607w6hdf1pjgaapn9fy6smk22i3d4ncqjlhk4xi55ifi6kf6pj";
self = { self = {
llvm = callPackage ./llvm.nix rec { llvm = callPackage ./llvm.nix rec {
version = "3.5.0"; version = "3.5.2";
fetch = fetch_v version; fetch = fetch_v version;
inherit compiler-rt_src; inherit compiler-rt_src;
}; };
clang = callPackage ./clang.nix rec { clang = callPackage ./clang.nix rec {
version = "3.5.0"; version = "3.5.2";
fetch = fetch_v version; fetch = fetch_v version;
inherit clang-tools-extra_src; inherit clang-tools-extra_src;
}; };
@ -37,5 +37,7 @@ let
libcxx = callPackage ./libc++ { stdenv = pkgs.clangStdenv; }; libcxx = callPackage ./libc++ { stdenv = pkgs.clangStdenv; };
libcxxabi = callPackage ./libc++abi { stdenv = pkgs.clangStdenv; }; libcxxabi = callPackage ./libc++abi { stdenv = pkgs.clangStdenv; };
#openmp = callPackage ./openmp {};
}; };
in self in self

2
pkgs/development/compilers/llvm/3.5/dragonegg.nix
View File

@ -3,7 +3,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "dragonegg-${version}"; name = "dragonegg-${version}";
src = fetch "dragonegg" "1v1lc9h2nfk3lsk9sx1k4ckwddz813hqjmlp2bx2kwxx9hw364ar"; src = fetch "dragonegg" "1va4wv2b1dj0dpzsksnpnd0jic52q7pqj79w3m9jwdb58h7104dw";
# The gcc the plugin will be built for (the same used building dragonegg) # The gcc the plugin will be built for (the same used building dragonegg)
GCC = "gcc"; GCC = "gcc";

4
pkgs/development/compilers/llvm/3.5/libc++/default.nix
View File

@ -1,13 +1,13 @@
{ lib, stdenv, fetchurl, cmake, libcxxabi, fixDarwinDylibNames }: { lib, stdenv, fetchurl, cmake, libcxxabi, fixDarwinDylibNames }:
let version = "3.5.0"; in let version = "3.5.2"; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libc++-${version}"; name = "libc++-${version}";
src = fetchurl { src = fetchurl {
url = "http://llvm.org/releases/${version}/libcxx-${version}.src.tar.xz"; 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, # instead of allowing libc++ to link with /usr/lib/libc++abi.dylib,

4
pkgs/development/compilers/llvm/3.5/libc++abi/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, cmake, fetchurl, libcxx, libunwind, llvm }: { stdenv, cmake, fetchurl, libcxx, libunwind, llvm }:
let let
version = "3.5.0"; version = "3.5.2";
cmakeLists = fetchurl { cmakeLists = fetchurl {
name = "CMakeLists.txt"; name = "CMakeLists.txt";
url = "http://llvm.org/svn/llvm-project/libcxxabi/trunk/CMakeLists.txt?p=217324"; url = "http://llvm.org/svn/llvm-project/libcxxabi/trunk/CMakeLists.txt?p=217324";
@ -12,7 +12,7 @@ in stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "http://llvm.org/releases/${version}/libcxxabi-${version}.src.tar.xz"; url = "http://llvm.org/releases/${version}/libcxxabi-${version}.src.tar.xz";
sha256 = "1ndcpw3gfrzh7m1jac2qadhkrqgvb65cns69j9niydyj5mmbxijk"; sha256 = "1c6rv0zx0na1w4hdmdfq2f6nj7limb7d1krrknwajxxkcn4yws92";
}; };
buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin) libunwind; buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin) libunwind;

2
pkgs/development/compilers/llvm/3.5/lld.nix
View File

@ -3,7 +3,7 @@
stdenv.mkDerivation { stdenv.mkDerivation {
name = "lld-${version}"; name = "lld-${version}";
src = fetch "lld" "1sd4scqynryfrmcc4h0ljgwn2dgjmbbmf38z50ya6l0janpd2nxx"; src = fetch "lld" "1hpqawg1sc8mdqxqaxqmlzbrn69w1pkj8rxhjgqgmwra6c0xky89";
preUnpack = '' preUnpack = ''
# !!! Hopefully won't be needed for 3.5 # !!! Hopefully won't be needed for 3.5

2
pkgs/development/compilers/llvm/3.5/lldb.nix
View File

@ -15,7 +15,7 @@
stdenv.mkDerivation { stdenv.mkDerivation {
name = "lldb-${version}"; name = "lldb-${version}";
src = fetch "lldb" "0h8cmjrhjhigk7k2qll1pcf6jfgmbdzkzfz2i048pkfg851s0x44"; src = fetch "lldb" "0ffi9jn4k3yd0hvxs1v4n710x8siq21lb49v3351d7j5qinrpgi7";
patchPhase = '' patchPhase = ''
sed -i 's|/usr/bin/env||' \ sed -i 's|/usr/bin/env||' \

2
pkgs/development/compilers/llvm/3.5/llvm.nix
View File

@ -15,7 +15,7 @@
}: }:
let let
src = fetch "llvm" "00swb43mzlvda8306arlg2jw7g6k3acwfccgf1k4c2pgd3rrkq98"; src = fetch "llvm" "0xf5q17kkxsrm2gsi93h4pwlv663kji73r2g4asb97klsmb626a4";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "llvm-${version}"; name = "llvm-${version}";

2
pkgs/development/compilers/llvm/3.5/polly.nix
View File

@ -3,7 +3,7 @@
stdenv.mkDerivation { stdenv.mkDerivation {
name = "polly-${version}"; name = "polly-${version}";
src = fetch "polly" "1rqflmgzg1vzjm0r32c5ck8x3q0qm3g0hh8ggbjazh6x7nvmy6ll"; src = fetch "polly" "1s6v54czmgq626an4yk2k34lrzkwmz1bjrbiafh7j23yc2w4nalx";
patches = [ ./polly-separate-build.patch ]; patches = [ ./polly-separate-build.patch ];

4
pkgs/top-level/all-packages.nix
View File

@ -4196,7 +4196,9 @@ let
isl = isl_0_12; isl = isl_0_12;
}; };
llvmPackages_35 = callPackage ../development/compilers/llvm/3.5 { }; llvmPackages_35 = callPackage ../development/compilers/llvm/3.5 {
isl = isl_0_14;
};
llvmPackages_36 = callPackage ../development/compilers/llvm/3.6 { llvmPackages_36 = callPackage ../development/compilers/llvm/3.6 {
inherit (stdenvAdapters) overrideCC; inherit (stdenvAdapters) overrideCC;