diff options
author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-07-11 20:09:55 -0400 |
---|---|---|
committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-07-17 10:30:05 +0200 |
commit | 325f37f93512fccbcfd8b60b7f3d9a15708d0372 (patch) | |
tree | a284152f2cf7bcc734052d7aa7ce075d65d42d13 /pkgs | |
parent | c9965679489f7a8bf1bac0d4a8983d7372186832 (diff) | |
download | nixlib-325f37f93512fccbcfd8b60b7f3d9a15708d0372.tar nixlib-325f37f93512fccbcfd8b60b7f3d9a15708d0372.tar.gz nixlib-325f37f93512fccbcfd8b60b7f3d9a15708d0372.tar.bz2 nixlib-325f37f93512fccbcfd8b60b7f3d9a15708d0372.tar.lz nixlib-325f37f93512fccbcfd8b60b7f3d9a15708d0372.tar.xz nixlib-325f37f93512fccbcfd8b60b7f3d9a15708d0372.tar.zst nixlib-325f37f93512fccbcfd8b60b7f3d9a15708d0372.zip |
llvm_*,clang_*: allow src overrides
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/compilers/llvm/3.5/clang.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/3.5/llvm.nix | 10 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/3.8/clang/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/3.8/llvm.nix | 10 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/3.9/clang/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/3.9/llvm.nix | 8 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/4/clang/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/4/llvm.nix | 8 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/5/clang/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/5/llvm.nix | 8 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/6/clang/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/6/llvm.nix | 8 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/7/clang/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/7/llvm.nix | 12 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/8/clang/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/8/llvm.nix | 12 |
16 files changed, 54 insertions, 54 deletions
diff --git a/pkgs/development/compilers/llvm/3.5/clang.nix b/pkgs/development/compilers/llvm/3.5/clang.nix index 7e0163577baf..132cd67a4aeb 100644 --- a/pkgs/development/compilers/llvm/3.5/clang.nix +++ b/pkgs/development/compilers/llvm/3.5/clang.nix @@ -4,8 +4,10 @@ let in stdenv.mkDerivation { name = "clang-${version}"; + src = fetch "cfe" "0846h8vn3zlc00jkmvrmy88gc6ql6014c02l4jv78fpvfigmgssg"; + unpackPhase = '' - unpackFile ${fetch "cfe" "0846h8vn3zlc00jkmvrmy88gc6ql6014c02l4jv78fpvfigmgssg"} + unpackFile $src mv cfe-${version}.src clang sourceRoot=$PWD/clang unpackFile ${clang-tools-extra_src} diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix index 2645469767ad..6eec99717785 100644 --- a/pkgs/development/compilers/llvm/3.5/llvm.nix +++ b/pkgs/development/compilers/llvm/3.5/llvm.nix @@ -17,13 +17,13 @@ , enableSharedLibraries ? !stdenv.isDarwin }: -let - src = fetch "llvm" "0xf5q17kkxsrm2gsi93h4pwlv663kji73r2g4asb97klsmb626a4"; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "llvm-${version}"; + src = fetch "llvm" "0xf5q17kkxsrm2gsi93h4pwlv663kji73r2g4asb97klsmb626a4"; + unpackPhase = '' - unpackFile ${src} + unpackFile $src mv llvm-${version}.src llvm sourceRoot=$PWD/llvm unpackFile ${compiler-rt_src} @@ -85,8 +85,6 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.src = src; - meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = http://llvm.org/; diff --git a/pkgs/development/compilers/llvm/3.8/clang/default.nix b/pkgs/development/compilers/llvm/3.8/clang/default.nix index cc25a41b0400..47a1bed126da 100644 --- a/pkgs/development/compilers/llvm/3.8/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.8/clang/default.nix @@ -5,8 +5,10 @@ let self = stdenv.mkDerivation { name = "clang-${version}"; + src = fetch "cfe" "1prc72xmkgx8wrzmrr337776676nhsp1qd3mw2bvb22bzdnq7lsc"; + unpackPhase = '' - unpackFile ${fetch "cfe" "1prc72xmkgx8wrzmrr337776676nhsp1qd3mw2bvb22bzdnq7lsc"} + unpackFile $src mv cfe-${version}.src clang sourceRoot=$PWD/clang unpackFile ${clang-tools-extra_src} diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index 261a1d0f94ca..a73b73137ddc 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -16,13 +16,13 @@ , enableSharedLibraries ? true }: -let - src = fetch "llvm" "1ybmnid4pw2hxn12ax5qa5kl1ldfns0njg8533y3mzslvd5cx0kf"; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "llvm-${version}"; + src = fetch "llvm" "1ybmnid4pw2hxn12ax5qa5kl1ldfns0njg8533y3mzslvd5cx0kf"; + unpackPhase = '' - unpackFile ${src} + unpackFile $src mv llvm-${version}.src llvm sourceRoot=$PWD/llvm unpackFile ${compiler-rt_src} @@ -105,8 +105,6 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.src = src; - meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = http://llvm.org/; diff --git a/pkgs/development/compilers/llvm/3.9/clang/default.nix b/pkgs/development/compilers/llvm/3.9/clang/default.nix index f597c559dba6..e2cf437e19e1 100644 --- a/pkgs/development/compilers/llvm/3.9/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.9/clang/default.nix @@ -5,8 +5,10 @@ let self = stdenv.mkDerivation { name = "clang-${version}"; + src = fetch "cfe" "0qsyyb40iwifhhlx9a3drf8z6ni6zwyk3bvh0kx2gs6yjsxwxi76"; + unpackPhase = '' - unpackFile ${fetch "cfe" "0qsyyb40iwifhhlx9a3drf8z6ni6zwyk3bvh0kx2gs6yjsxwxi76"} + unpackFile $src mv cfe-${version}.src clang sourceRoot=$PWD/clang unpackFile ${clang-tools-extra_src} diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix index 174cb17908cc..c8d819cc9634 100644 --- a/pkgs/development/compilers/llvm/3.9/llvm.nix +++ b/pkgs/development/compilers/llvm/3.9/llvm.nix @@ -20,8 +20,6 @@ assert (stdenv.hostPlatform != stdenv.buildPlatform) -> !enableSharedLibraries; let - src = fetch "llvm" "1vi9sf7rx1q04wj479rsvxayb6z740iaz3qniwp266fgp5a07n8z"; - # Used when creating a versioned symlinks of libLLVM.dylib versionSuffixes = with stdenv.lib; let parts = splitString "." version; in @@ -31,8 +29,10 @@ in stdenv.mkDerivation { name = "llvm-${version}"; + src = fetch "llvm" "1vi9sf7rx1q04wj479rsvxayb6z740iaz3qniwp266fgp5a07n8z"; + unpackPhase = '' - unpackFile ${src} + unpackFile $src mv llvm-${version}.src llvm sourceRoot=$PWD/llvm unpackFile ${compiler-rt_src} @@ -163,8 +163,6 @@ stdenv.mkDerivation { enableParallelBuilding = true; - passthru.src = src; - meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = http://llvm.org/; diff --git a/pkgs/development/compilers/llvm/4/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix index c6538282f23e..f50da39a6249 100644 --- a/pkgs/development/compilers/llvm/4/clang/default.nix +++ b/pkgs/development/compilers/llvm/4/clang/default.nix @@ -8,8 +8,10 @@ let self = stdenv.mkDerivation ({ name = "clang-${version}"; + src = fetch "cfe" "16vnv3msnvx33dydd17k2cq0icndi1a06bg5vcxkrhjjb1rqlwv1"; + unpackPhase = '' - unpackFile ${fetch "cfe" "16vnv3msnvx33dydd17k2cq0icndi1a06bg5vcxkrhjjb1rqlwv1"} + unpackFile $src mv cfe-${version}* clang sourceRoot=$PWD/clang unpackFile ${clang-tools-extra_src} diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix index ecb18a580540..ea70382d2ac7 100644 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ b/pkgs/development/compilers/llvm/4/llvm.nix @@ -17,8 +17,6 @@ }: let - src = fetch "llvm" "0l9bf7kdwhlj0kq1hawpyxhna1062z3h7qcz2y8nfl9dz2qksy6s"; - # Used when creating a versioned symlinks of libLLVM.dylib versionSuffixes = with stdenv.lib; let parts = splitString "." release_version; in @@ -28,8 +26,10 @@ in stdenv.mkDerivation (rec { name = "llvm-${version}"; + src = fetch "llvm" "0l9bf7kdwhlj0kq1hawpyxhna1062z3h7qcz2y8nfl9dz2qksy6s"; + unpackPhase = '' - unpackFile ${src} + unpackFile $src mv llvm-${version}* llvm sourceRoot=$PWD/llvm unpackFile ${compiler-rt_src} @@ -150,8 +150,6 @@ stdenv.mkDerivation (rec { enableParallelBuilding = true; - passthru.src = src; - meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = http://llvm.org/; diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix index 5fd0271f0261..7a3b151f8358 100644 --- a/pkgs/development/compilers/llvm/5/clang/default.nix +++ b/pkgs/development/compilers/llvm/5/clang/default.nix @@ -8,8 +8,10 @@ let self = stdenv.mkDerivation ({ name = "clang-${version}"; + src = fetch "cfe" "0018520c4qxf5hgjdqgpz2dgl3faf4gsz87fdlb8zdmx99rfk77s"; + unpackPhase = '' - unpackFile ${fetch "cfe" "0018520c4qxf5hgjdqgpz2dgl3faf4gsz87fdlb8zdmx99rfk77s"} + unpackFile $src mv cfe-${version}* clang sourceRoot=$PWD/clang unpackFile ${clang-tools-extra_src} diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix index 122576cc726e..23b7bf4e2461 100644 --- a/pkgs/development/compilers/llvm/5/llvm.nix +++ b/pkgs/development/compilers/llvm/5/llvm.nix @@ -15,8 +15,6 @@ }: let - src = fetch "llvm" "0g1bbj2n6xv4p1n6hh17vj3vpvg56wacipc81dgwga9mg2lys8nm"; - # Used when creating a versioned symlinks of libLLVM.dylib versionSuffixes = with stdenv.lib; let parts = splitString "." release_version; in @@ -26,8 +24,10 @@ in stdenv.mkDerivation (rec { name = "llvm-${version}"; + src = fetch "llvm" "0g1bbj2n6xv4p1n6hh17vj3vpvg56wacipc81dgwga9mg2lys8nm"; + unpackPhase = '' - unpackFile ${src} + unpackFile $src mv llvm-${version}* llvm sourceRoot=$PWD/llvm ''; @@ -132,8 +132,6 @@ stdenv.mkDerivation (rec { enableParallelBuilding = true; - passthru.src = src; - requiredSystemFeatures = [ "big-parallel" ]; meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/pkgs/development/compilers/llvm/6/clang/default.nix index 840567496785..ff9064f455ec 100644 --- a/pkgs/development/compilers/llvm/6/clang/default.nix +++ b/pkgs/development/compilers/llvm/6/clang/default.nix @@ -8,8 +8,10 @@ let self = stdenv.mkDerivation ({ name = "clang-${version}"; + src = fetch "cfe" "0rxn4rh7rrnsqbdgp4gzc8ishbkryhpl1kd3mpnxzpxxhla3y93w"; + unpackPhase = '' - unpackFile ${fetch "cfe" "0rxn4rh7rrnsqbdgp4gzc8ishbkryhpl1kd3mpnxzpxxhla3y93w"} + unpackFile $src mv cfe-${version}* clang sourceRoot=$PWD/clang unpackFile ${clang-tools-extra_src} diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix index 9237d442b776..e104d051fed7 100644 --- a/pkgs/development/compilers/llvm/6/llvm.nix +++ b/pkgs/development/compilers/llvm/6/llvm.nix @@ -19,8 +19,6 @@ let inherit (stdenv.lib) optional optionals optionalString; - src = fetch "llvm" "1qpls3vk85lydi5b4axl0809fv932qgsqgdgrk098567z4jc7mmn"; - # Used when creating a versioned symlinks of libLLVM.dylib versionSuffixes = with stdenv.lib; let parts = splitString "." release_version; in @@ -30,8 +28,10 @@ in stdenv.mkDerivation (rec { name = "llvm-${version}"; + src = fetch "llvm" "1qpls3vk85lydi5b4axl0809fv932qgsqgdgrk098567z4jc7mmn"; + unpackPhase = '' - unpackFile ${src} + unpackFile $src mv llvm-${version}* llvm sourceRoot=$PWD/llvm ''; @@ -146,8 +146,6 @@ stdenv.mkDerivation (rec { enableParallelBuilding = true; - passthru.src = src; - meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = http://llvm.org/; diff --git a/pkgs/development/compilers/llvm/7/clang/default.nix b/pkgs/development/compilers/llvm/7/clang/default.nix index a4877b3fe6f5..e49c8387f7ef 100644 --- a/pkgs/development/compilers/llvm/7/clang/default.nix +++ b/pkgs/development/compilers/llvm/7/clang/default.nix @@ -8,8 +8,10 @@ let self = stdenv.mkDerivation ({ name = "clang-${version}"; + src = fetch "cfe" "0vc4i87qwxnw9lci4ayws9spakg0z6w5w670snj9f8g5m9rc8zg9"; + unpackPhase = '' - unpackFile ${fetch "cfe" "0vc4i87qwxnw9lci4ayws9spakg0z6w5w670snj9f8g5m9rc8zg9"} + unpackFile $src mv cfe-${version}* clang sourceRoot=$PWD/clang unpackFile ${clang-tools-extra_src} diff --git a/pkgs/development/compilers/llvm/7/llvm.nix b/pkgs/development/compilers/llvm/7/llvm.nix index dc10de26ba10..a9caa88141a6 100644 --- a/pkgs/development/compilers/llvm/7/llvm.nix +++ b/pkgs/development/compilers/llvm/7/llvm.nix @@ -24,9 +24,6 @@ let inherit (stdenv.lib) optional optionals optionalString; - src = fetch "llvm" "0r1p5didv4rkgxyvbkyz671xddg6i3dxvbpsi1xxipkla0l9pk0v"; - polly_src = fetch "polly" "16qkns4ab4x0azrvhy4j7cncbyb2rrbdrqj87zphvqxm5pvm8m1h"; - # Used when creating a versioned symlinks of libLLVM.dylib versionSuffixes = with stdenv.lib; let parts = splitString "." release_version; in @@ -35,12 +32,15 @@ let in stdenv.mkDerivation (rec { name = "llvm-${version}"; + src = fetch "llvm" "0r1p5didv4rkgxyvbkyz671xddg6i3dxvbpsi1xxipkla0l9pk0v"; + polly_src = fetch "polly" "16qkns4ab4x0azrvhy4j7cncbyb2rrbdrqj87zphvqxm5pvm8m1h"; + unpackPhase = '' - unpackFile ${src} + unpackFile $src mv llvm-${version}* llvm sourceRoot=$PWD/llvm '' + optionalString enablePolly '' - unpackFile ${polly_src} + unpackFile $polly_src mv polly-* $sourceRoot/tools/polly ''; @@ -164,8 +164,6 @@ in stdenv.mkDerivation (rec { enableParallelBuilding = true; - passthru.src = src; - meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = http://llvm.org/; diff --git a/pkgs/development/compilers/llvm/8/clang/default.nix b/pkgs/development/compilers/llvm/8/clang/default.nix index 5a8b8922eb06..0b38660c4c4d 100644 --- a/pkgs/development/compilers/llvm/8/clang/default.nix +++ b/pkgs/development/compilers/llvm/8/clang/default.nix @@ -8,8 +8,10 @@ let self = stdenv.mkDerivation ({ name = "clang-${version}"; + src = fetch "cfe" "0svk1f70hvpwrjp6x5i9kqwrqwxnmcrw5s7f4cxyd100mdd12k08"; + unpackPhase = '' - unpackFile ${fetch "cfe" "0svk1f70hvpwrjp6x5i9kqwrqwxnmcrw5s7f4cxyd100mdd12k08"} + unpackFile $src mv cfe-${version}* clang sourceRoot=$PWD/clang unpackFile ${clang-tools-extra_src} diff --git a/pkgs/development/compilers/llvm/8/llvm.nix b/pkgs/development/compilers/llvm/8/llvm.nix index 18013a9cfad5..1827273d57eb 100644 --- a/pkgs/development/compilers/llvm/8/llvm.nix +++ b/pkgs/development/compilers/llvm/8/llvm.nix @@ -23,9 +23,6 @@ let inherit (stdenv.lib) optional optionals optionalString; - src = fetch "llvm" "0k124sxkfhfi1rca6kzkdraf4axhx99x3cw2rk55056628dvwwl8"; - polly_src = fetch "polly" "1x4xv3j226rqdddp7b61d71wsx2b8vmmri02ycx27y2fg7ba7xg3"; - # Used when creating a version-suffixed symlink of libLLVM.dylib shortVersion = with stdenv.lib; concatStringsSep "." (take 1 (splitString "." release_version)); @@ -33,12 +30,15 @@ let in stdenv.mkDerivation (rec { name = "llvm-${version}"; + src = fetch "llvm" "0k124sxkfhfi1rca6kzkdraf4axhx99x3cw2rk55056628dvwwl8"; + polly_src = fetch "polly" "1x4xv3j226rqdddp7b61d71wsx2b8vmmri02ycx27y2fg7ba7xg3"; + unpackPhase = '' - unpackFile ${src} + unpackFile $src mv llvm-${version}* llvm sourceRoot=$PWD/llvm '' + optionalString enablePolly '' - unpackFile ${polly_src} + unpackFile $polly_src mv polly-* $sourceRoot/tools/polly ''; @@ -142,8 +142,6 @@ in stdenv.mkDerivation (rec { enableParallelBuilding = true; - passthru.src = src; - meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = http://llvm.org/; |