tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
llvmPackages_4: 4.0.0 -> 4.0.1
Will Dietz
8 years ago
495a022e
dbb3037d
+10
-17
8 changed files
expand all
collapse all
unified
split
pkgs
development
compilers
llvm
4
clang
default.nix
default.nix
libc++
default.nix
libc++abi.nix
lld.nix
lldb.nix
llvm.nix
openmp.nix
+1
-1
pkgs/development/compilers/llvm/4/clang/default.nix
···
9
9
name = "clang-${version}";
10
10
11
11
unpackPhase = ''
12
12
-
unpackFile ${fetch "cfe" "12n99m60aa680cir3ql56s1jsv6lp61hq4w9rabf4c6vpn7gi9ff"}
12
12
+
unpackFile ${fetch "cfe" "16vnv3msnvx33dydd17k2cq0icndi1a06bg5vcxkrhjjb1rqlwv1"}
13
13
mv cfe-${version}* clang
14
14
sourceRoot=$PWD/clang
15
15
unpackFile ${clang-tools-extra_src}
+3
-3
pkgs/development/compilers/llvm/4/default.nix
···
2
2
let
3
3
callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
4
4
5
5
-
release_version = "4.0.0";
5
5
+
release_version = "4.0.1";
6
6
version = release_version; # differentiating these is important for rc's
7
7
8
8
fetch = name: sha256: fetchurl {
···
10
10
inherit sha256;
11
11
};
12
12
13
13
-
compiler-rt_src = fetch "compiler-rt" "059ipqq27gd928ay06f1ck3vw6y5h5z4zd766x8k0k7jpqimpwnk";
14
14
-
clang-tools-extra_src = fetch "clang-tools-extra" "16bwckgcxfn56mbqjlxi7fxja0zm9hjfa6s3ncm3dz98n5zd7ds1";
13
13
+
compiler-rt_src = fetch "compiler-rt" "0h5lpv1z554szi4r4blbskhwrkd78ir50v3ng8xvk1s86fa7gj53";
14
14
+
clang-tools-extra_src = fetch "clang-tools-extra" "1dhmp7ccfpr42bmvk3kp37ngjpf3a9m5d4kkpsn7d00hzi7fdl9m";
15
15
16
16
self = {
17
17
llvm = callPackage ./llvm.nix {
+1
-1
pkgs/development/compilers/llvm/4/libc++/default.nix
···
3
3
stdenv.mkDerivation rec {
4
4
name = "libc++-${version}";
5
5
6
6
-
src = fetch "libcxx" "15ngfcjc3pjakpwfq7d4n546jj0rgfdv5rpb1qv9xgv9mp236kag";
6
6
+
src = fetch "libcxx" "0k6cmjcxnp2pyl8xwy1wkyyckkmdrjddim94yf1gzjbjy9qi22jj";
7
7
8
8
postUnpack = ''
9
9
unpackFile ${libcxxabi.src}
+1
-1
pkgs/development/compilers/llvm/4/libc++abi.nix
···
3
3
stdenv.mkDerivation {
4
4
name = "libc++abi-${version}";
5
5
6
6
-
src = fetch "libcxxabi" "1n416kv27anabg9jsw6331r28ic30xk46p381lx2vbb2jrhwpafw";
6
6
+
src = fetch "libcxxabi" "0cqvzallxh0nwiijsf6i4d5ds9m5ijfzywg7376ncv50i64if24g";
7
7
8
8
nativeBuildInputs = [ cmake ];
9
9
buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
+1
-1
pkgs/development/compilers/llvm/4/lld.nix
···
10
10
stdenv.mkDerivation {
11
11
name = "lld-${version}";
12
12
13
13
-
src = fetch "lld" "00km1qawk146pyjqa6aphcdzgkzrmg6cgk0ikg4661ffp5bn9q1k";
13
13
+
src = fetch "lld" "1v9nkpr158j4yd4zmi6rpnfxkp78r1fapr8wji9s6v176gji1kk3";
14
14
15
15
nativeBuildInputs = [ cmake ];
16
16
buildInputs = [ llvm ];
+1
-1
pkgs/development/compilers/llvm/4/lldb.nix
···
17
17
stdenv.mkDerivation {
18
18
name = "lldb-${version}";
19
19
20
20
-
src = fetch "lldb" "0g83hbw1r4gd0z8hlph9i34xs6dlcc69vz3h2bqwkhb2qq2qzg9d";
20
20
+
src = fetch "lldb" "0yy43a27zx3r51b6gkv3v2mdiqcq3mf0ngki47ya0i30v3gx4cl4";
21
21
22
22
patches = [ ./lldb-libedit.patch ];
23
23
postPatch = ''
+1
-8
pkgs/development/compilers/llvm/4/llvm.nix
···
22
22
}:
23
23
24
24
let
25
25
-
src = fetch "llvm" "1giklnw71wzsgbqg9wb5x7dxnbj39m6zpfvskvzvhwvfz4fm244d";
25
25
+
src = fetch "llvm" "0l9bf7kdwhlj0kq1hawpyxhna1062z3h7qcz2y8nfl9dz2qksy6s";
26
26
shlib = if stdenv.isDarwin then "dylib" else "so";
27
27
28
28
# Used when creating a version-suffixed symlink of libLLVM.dylib
···
64
64
+ stdenv.lib.optionalString (enableSharedLibraries) ''
65
65
substitute '${./llvm-outputs.patch}' ./llvm-outputs.patch --subst-var lib
66
66
patch -p1 < ./llvm-outputs.patch
67
67
-
''
68
68
-
# Remove broken tests: (https://bugs.llvm.org//show_bug.cgi?id=31610)
69
69
-
+ ''
70
70
-
rm test/CodeGen/AMDGPU/invalid-opencl-version-metadata1.ll
71
71
-
rm test/CodeGen/AMDGPU/invalid-opencl-version-metadata2.ll
72
72
-
rm test/CodeGen/AMDGPU/invalid-opencl-version-metadata3.ll
73
73
-
rm test/CodeGen/AMDGPU/runtime-metadata.ll
74
67
'';
75
68
76
69
# hacky fix: created binaries need to be run before installation
+1
-1
pkgs/development/compilers/llvm/4/openmp.nix
···
10
10
stdenv.mkDerivation {
11
11
name = "openmp-${version}";
12
12
13
13
-
src = fetch "openmp" "09kf41zgv551fnv628kqhlwgqkd2bkiwii9gqi6q12djgdddhmfv";
13
13
+
src = fetch "openmp" "195dykamd39yhi5az7nqj3ksqhb3wq30l93jnfkxl0061qbknsgc";
14
14
15
15
nativeBuildInputs = [ cmake perl ];
16
16
buildInputs = [ llvm ];