commit 495a022e440d1eb0cc17008da9d4ce516dcf82a5 · pyrox.dev/nixpkgs

+1 -1

pkgs/development/compilers/llvm/4/clang/default.nix

··· 9 name = "clang-${version}"; 10 11 unpackPhase = '' 12 - unpackFile ${fetch "cfe" "12n99m60aa680cir3ql56s1jsv6lp61hq4w9rabf4c6vpn7gi9ff"} 13 mv cfe-${version}* clang 14 sourceRoot=$PWD/clang 15 unpackFile ${clang-tools-extra_src}

··· 9 name = "clang-${version}"; 10 11 unpackPhase = '' 12 + unpackFile ${fetch "cfe" "16vnv3msnvx33dydd17k2cq0icndi1a06bg5vcxkrhjjb1rqlwv1"} 13 mv cfe-${version}* clang 14 sourceRoot=$PWD/clang 15 unpackFile ${clang-tools-extra_src}

+3 -3

pkgs/development/compilers/llvm/4/default.nix

··· 2 let 3 callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); 4 5 - release_version = "4.0.0"; 6 version = release_version; # differentiating these is important for rc's 7 8 fetch = name: sha256: fetchurl { ··· 10 inherit sha256; 11 }; 12 13 - compiler-rt_src = fetch "compiler-rt" "059ipqq27gd928ay06f1ck3vw6y5h5z4zd766x8k0k7jpqimpwnk"; 14 - clang-tools-extra_src = fetch "clang-tools-extra" "16bwckgcxfn56mbqjlxi7fxja0zm9hjfa6s3ncm3dz98n5zd7ds1"; 15 16 self = { 17 llvm = callPackage ./llvm.nix {

··· 2 let 3 callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); 4 5 + release_version = "4.0.1"; 6 version = release_version; # differentiating these is important for rc's 7 8 fetch = name: sha256: fetchurl { ··· 10 inherit sha256; 11 }; 12 13 + compiler-rt_src = fetch "compiler-rt" "0h5lpv1z554szi4r4blbskhwrkd78ir50v3ng8xvk1s86fa7gj53"; 14 + clang-tools-extra_src = fetch "clang-tools-extra" "1dhmp7ccfpr42bmvk3kp37ngjpf3a9m5d4kkpsn7d00hzi7fdl9m"; 15 16 self = { 17 llvm = callPackage ./llvm.nix {

+1 -1

pkgs/development/compilers/llvm/4/libc++/default.nix

··· 3 stdenv.mkDerivation rec { 4 name = "libc++-${version}"; 5 6 - src = fetch "libcxx" "15ngfcjc3pjakpwfq7d4n546jj0rgfdv5rpb1qv9xgv9mp236kag"; 7 8 postUnpack = '' 9 unpackFile ${libcxxabi.src}

··· 3 stdenv.mkDerivation rec { 4 name = "libc++-${version}"; 5 6 + src = fetch "libcxx" "0k6cmjcxnp2pyl8xwy1wkyyckkmdrjddim94yf1gzjbjy9qi22jj"; 7 8 postUnpack = '' 9 unpackFile ${libcxxabi.src}

+1 -1

pkgs/development/compilers/llvm/4/libc++abi.nix

··· 3 stdenv.mkDerivation { 4 name = "libc++abi-${version}"; 5 6 - src = fetch "libcxxabi" "1n416kv27anabg9jsw6331r28ic30xk46p381lx2vbb2jrhwpafw"; 7 8 nativeBuildInputs = [ cmake ]; 9 buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;

··· 3 stdenv.mkDerivation { 4 name = "libc++abi-${version}"; 5 6 + src = fetch "libcxxabi" "0cqvzallxh0nwiijsf6i4d5ds9m5ijfzywg7376ncv50i64if24g"; 7 8 nativeBuildInputs = [ cmake ]; 9 buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;

+1 -1

pkgs/development/compilers/llvm/4/lld.nix

··· 10 stdenv.mkDerivation { 11 name = "lld-${version}"; 12 13 - src = fetch "lld" "00km1qawk146pyjqa6aphcdzgkzrmg6cgk0ikg4661ffp5bn9q1k"; 14 15 nativeBuildInputs = [ cmake ]; 16 buildInputs = [ llvm ];

··· 10 stdenv.mkDerivation { 11 name = "lld-${version}"; 12 13 + src = fetch "lld" "1v9nkpr158j4yd4zmi6rpnfxkp78r1fapr8wji9s6v176gji1kk3"; 14 15 nativeBuildInputs = [ cmake ]; 16 buildInputs = [ llvm ];

+1 -1

pkgs/development/compilers/llvm/4/lldb.nix

··· 17 stdenv.mkDerivation { 18 name = "lldb-${version}"; 19 20 - src = fetch "lldb" "0g83hbw1r4gd0z8hlph9i34xs6dlcc69vz3h2bqwkhb2qq2qzg9d"; 21 22 patches = [ ./lldb-libedit.patch ]; 23 postPatch = ''

··· 17 stdenv.mkDerivation { 18 name = "lldb-${version}"; 19 20 + src = fetch "lldb" "0yy43a27zx3r51b6gkv3v2mdiqcq3mf0ngki47ya0i30v3gx4cl4"; 21 22 patches = [ ./lldb-libedit.patch ]; 23 postPatch = ''

+1 -8

pkgs/development/compilers/llvm/4/llvm.nix

··· 22 }: 23 24 let 25 - src = fetch "llvm" "1giklnw71wzsgbqg9wb5x7dxnbj39m6zpfvskvzvhwvfz4fm244d"; 26 shlib = if stdenv.isDarwin then "dylib" else "so"; 27 28 # Used when creating a version-suffixed symlink of libLLVM.dylib ··· 64 + stdenv.lib.optionalString (enableSharedLibraries) '' 65 substitute '${./llvm-outputs.patch}' ./llvm-outputs.patch --subst-var lib 66 patch -p1 < ./llvm-outputs.patch 67 - '' 68 - # Remove broken tests: (https://bugs.llvm.org//show_bug.cgi?id=31610) 69 - + '' 70 - rm test/CodeGen/AMDGPU/invalid-opencl-version-metadata1.ll 71 - rm test/CodeGen/AMDGPU/invalid-opencl-version-metadata2.ll 72 - rm test/CodeGen/AMDGPU/invalid-opencl-version-metadata3.ll 73 - rm test/CodeGen/AMDGPU/runtime-metadata.ll 74 ''; 75 76 # hacky fix: created binaries need to be run before installation

··· 22 }: 23 24 let 25 + src = fetch "llvm" "0l9bf7kdwhlj0kq1hawpyxhna1062z3h7qcz2y8nfl9dz2qksy6s"; 26 shlib = if stdenv.isDarwin then "dylib" else "so"; 27 28 # Used when creating a version-suffixed symlink of libLLVM.dylib ··· 64 + stdenv.lib.optionalString (enableSharedLibraries) '' 65 substitute '${./llvm-outputs.patch}' ./llvm-outputs.patch --subst-var lib 66 patch -p1 < ./llvm-outputs.patch 67 ''; 68 69 # hacky fix: created binaries need to be run before installation

+1 -1

pkgs/development/compilers/llvm/4/openmp.nix

··· 10 stdenv.mkDerivation { 11 name = "openmp-${version}"; 12 13 - src = fetch "openmp" "09kf41zgv551fnv628kqhlwgqkd2bkiwii9gqi6q12djgdddhmfv"; 14 15 nativeBuildInputs = [ cmake perl ]; 16 buildInputs = [ llvm ];

··· 10 stdenv.mkDerivation { 11 name = "openmp-${version}"; 12 13 + src = fetch "openmp" "195dykamd39yhi5az7nqj3ksqhb3wq30l93jnfkxl0061qbknsgc"; 14 15 nativeBuildInputs = [ cmake perl ]; 16 buildInputs = [ llvm ];