From 1c0cbf8aea860d7a08948b4706846058e073f5ea Mon Sep 17 00:00:00 2001 From: Gabor Greif Date: Wed, 23 Sep 2020 23:19:41 +0200 Subject: [PATCH 1/2] llvm_11: 11.0.0rc2 -> 11.0.0rc3 --- pkgs/development/compilers/llvm/11/clang/default.nix | 2 +- pkgs/development/compilers/llvm/11/compiler-rt.nix | 2 +- pkgs/development/compilers/llvm/11/default.nix | 4 ++-- pkgs/development/compilers/llvm/11/libc++/default.nix | 2 +- pkgs/development/compilers/llvm/11/libc++abi.nix | 2 +- pkgs/development/compilers/llvm/11/libunwind.nix | 2 +- pkgs/development/compilers/llvm/11/lld.nix | 2 +- pkgs/development/compilers/llvm/11/lldb.nix | 2 +- pkgs/development/compilers/llvm/11/llvm.nix | 4 ++-- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/development/compilers/llvm/11/clang/default.nix b/pkgs/development/compilers/llvm/11/clang/default.nix index 08f9339dc8e..ad0aea0db70 100644 --- a/pkgs/development/compilers/llvm/11/clang/default.nix +++ b/pkgs/development/compilers/llvm/11/clang/default.nix @@ -8,7 +8,7 @@ let pname = "clang"; inherit version; - src = fetch "clang" "18rv5nxk04fgk4ziix7z4s2cargdpqgvqrk3lnp3wvd6yb5g5p98"; + src = fetch "clang" "00wx4vn9pgans1kqdbii2rl8dlx6nwdgvh27imzc06qxl364fywd"; unpackPhase = '' unpackFile $src diff --git a/pkgs/development/compilers/llvm/11/compiler-rt.nix b/pkgs/development/compilers/llvm/11/compiler-rt.nix index 133db365942..15e6d77c71a 100644 --- a/pkgs/development/compilers/llvm/11/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/11/compiler-rt.nix @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { pname = "compiler-rt"; inherit version; - src = fetch pname "0qfgap6acxffm01hzk38pmzq8ac3isk90531dz0qf7fd5015jvvg"; + src = fetch pname "0k98q454hv8ngnan496dh8pj0l8nlxdc0zdv9xpsh9r7way15la9"; nativeBuildInputs = [ cmake python3 llvm ]; buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi; diff --git a/pkgs/development/compilers/llvm/11/default.nix b/pkgs/development/compilers/llvm/11/default.nix index cbb3df9f687..e0b473043ab 100644 --- a/pkgs/development/compilers/llvm/11/default.nix +++ b/pkgs/development/compilers/llvm/11/default.nix @@ -6,7 +6,7 @@ let release_version = "11.0.0"; - candidate = "rc2"; + candidate = "rc3"; version = "${release_version}${candidate}"; # differentiating these (variables) is important for RCs targetConfig = stdenv.targetPlatform.config; @@ -15,7 +15,7 @@ let inherit sha256; }; - clang-tools-extra_src = fetch "clang-tools-extra" "0bg2a9nmkdbj5qfd0vvqj8bgchcx1yzmylxxgvh8y5hhj4fz13fs"; + clang-tools-extra_src = fetch "clang-tools-extra" "0qmqzdiiq0prkn6gzzzhijjvmnj7n1h0y49lbw6c97l11frhishm"; tools = stdenv.lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); diff --git a/pkgs/development/compilers/llvm/11/libc++/default.nix b/pkgs/development/compilers/llvm/11/libc++/default.nix index a2ea7e29918..e8ade7dda46 100644 --- a/pkgs/development/compilers/llvm/11/libc++/default.nix +++ b/pkgs/development/compilers/llvm/11/libc++/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { pname = "libc++"; inherit version; - src = fetch "libcxx" "0aaci7iblfczv1jb22zjrwzxcrcx6x7klvjivmxm2zni0n2x3bd4"; + src = fetch "libcxx" "19lzg6n9vzcl9sk9xn2gbfnl4dzlhmxrm1d19ira1206xlmg39r7"; postUnpack = '' unpackFile ${libcxxabi.src} diff --git a/pkgs/development/compilers/llvm/11/libc++abi.nix b/pkgs/development/compilers/llvm/11/libc++abi.nix index bf7b3fd001d..62e45a89982 100644 --- a/pkgs/development/compilers/llvm/11/libc++abi.nix +++ b/pkgs/development/compilers/llvm/11/libc++abi.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { pname = "libc++abi"; inherit version; - src = fetch "libcxxabi" "04gqdzs13sw7f7a06h5zm5917d9f1k79l4rcm096grgvf0r7lnqx"; + src = fetch "libcxxabi" "01m66bbx2r8mzbg1k2dk4wrma7rsm668h02drh0v1zcp943bx4ig"; nativeBuildInputs = [ cmake ]; buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind; diff --git a/pkgs/development/compilers/llvm/11/libunwind.nix b/pkgs/development/compilers/llvm/11/libunwind.nix index 03b58ca8d1d..6e8c7647dca 100644 --- a/pkgs/development/compilers/llvm/11/libunwind.nix +++ b/pkgs/development/compilers/llvm/11/libunwind.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "libunwind"; inherit version; - src = fetch pname "1ch4a2yp821lgzxh9898f7nw2fnkrn3wh25sqg05hlks45znv30y"; + src = fetch pname "1cs0bygglc70aadzhnackd0mamc16y01z2yxv9jglxd0r78gk0ff"; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/compilers/llvm/11/lld.nix b/pkgs/development/compilers/llvm/11/lld.nix index 74d18a444fc..750a2297f05 100644 --- a/pkgs/development/compilers/llvm/11/lld.nix +++ b/pkgs/development/compilers/llvm/11/lld.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "lld"; inherit version; - src = fetch pname "0lqz5cfids0rrl02p0qq5s18p8ikaa9r5gwa2yvj3bismdhvmar8"; + src = fetch pname "0d77y8nr69bhxhy719ynl52j5h3pjzm31lhyx5f9cpflqk80m5f8"; nativeBuildInputs = [ cmake ]; buildInputs = [ llvm libxml2 ]; diff --git a/pkgs/development/compilers/llvm/11/lldb.nix b/pkgs/development/compilers/llvm/11/lldb.nix index c0b7f267f75..2d865460342 100644 --- a/pkgs/development/compilers/llvm/11/lldb.nix +++ b/pkgs/development/compilers/llvm/11/lldb.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (rec { pname = "lldb"; inherit version; - src = fetch pname "0hb582kvhxp3kcckz7imrihs0kszdaz09z22xfymyi4vgmcy62q3"; + src = fetch pname "0j56f7nr8awqpn4ynib6qi0riz1x7d4jsl2vhdlizz2fvyxvn5is"; patches = [ ./lldb-procfs.patch ]; diff --git a/pkgs/development/compilers/llvm/11/llvm.nix b/pkgs/development/compilers/llvm/11/llvm.nix index f15a7d12b80..aed0f08608f 100644 --- a/pkgs/development/compilers/llvm/11/llvm.nix +++ b/pkgs/development/compilers/llvm/11/llvm.nix @@ -32,8 +32,8 @@ in stdenv.mkDerivation (rec { pname = "llvm"; inherit version; - src = fetch pname "151c7nphn18dcw04yxyp6qdj8w19psb8nigf26djf7rhpi1fn0sh"; - polly_src = fetch "polly" "0caxfpaxhf38nam4gkb9xqlrw20v29cm8jf95ykkbngqw64rmgij"; + src = fetch pname "1f9ix9kvpr2nxwqbr73cwqvn9wsm5wlnza0hyji7z7pac8d2dxl6"; + polly_src = fetch "polly" "18ysra81fsyfcldydg0lxnwjhpd3kwxfdzvfx24dmgrykpbcqbi6"; unpackPhase = '' unpackFile $src From a64eabfe7c5c206209fce9d00f941389ff15dd8c Mon Sep 17 00:00:00 2001 From: Gabor Greif Date: Thu, 1 Oct 2020 01:23:54 +0200 Subject: [PATCH 2/2] llvm_11: 11.0.0rc3 -> 11.0.0rc5 --- pkgs/development/compilers/llvm/11/clang/default.nix | 2 +- pkgs/development/compilers/llvm/11/compiler-rt.nix | 2 +- pkgs/development/compilers/llvm/11/default.nix | 4 ++-- pkgs/development/compilers/llvm/11/libc++/default.nix | 2 +- pkgs/development/compilers/llvm/11/libc++abi.nix | 2 +- pkgs/development/compilers/llvm/11/libunwind.nix | 2 +- pkgs/development/compilers/llvm/11/lld.nix | 2 +- pkgs/development/compilers/llvm/11/lldb.nix | 2 +- pkgs/development/compilers/llvm/11/llvm.nix | 4 ++-- pkgs/development/compilers/llvm/11/openmp.nix | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/development/compilers/llvm/11/clang/default.nix b/pkgs/development/compilers/llvm/11/clang/default.nix index ad0aea0db70..3aa3ba0ee46 100644 --- a/pkgs/development/compilers/llvm/11/clang/default.nix +++ b/pkgs/development/compilers/llvm/11/clang/default.nix @@ -8,7 +8,7 @@ let pname = "clang"; inherit version; - src = fetch "clang" "00wx4vn9pgans1kqdbii2rl8dlx6nwdgvh27imzc06qxl364fywd"; + src = fetch "clang" "1p64l5a3x55118nyms1805qbk3r9w37nz1rb7xvbgc9fmyzaffay"; unpackPhase = '' unpackFile $src diff --git a/pkgs/development/compilers/llvm/11/compiler-rt.nix b/pkgs/development/compilers/llvm/11/compiler-rt.nix index 15e6d77c71a..e0cb712fe61 100644 --- a/pkgs/development/compilers/llvm/11/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/11/compiler-rt.nix @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { pname = "compiler-rt"; inherit version; - src = fetch pname "0k98q454hv8ngnan496dh8pj0l8nlxdc0zdv9xpsh9r7way15la9"; + src = fetch pname "0cpyi5g0wlwyb7gvy47k5rjiipnlhrr3ks4q4rlrlyax6w9dx98n"; nativeBuildInputs = [ cmake python3 llvm ]; buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi; diff --git a/pkgs/development/compilers/llvm/11/default.nix b/pkgs/development/compilers/llvm/11/default.nix index e0b473043ab..dc75fe9f96e 100644 --- a/pkgs/development/compilers/llvm/11/default.nix +++ b/pkgs/development/compilers/llvm/11/default.nix @@ -6,7 +6,7 @@ let release_version = "11.0.0"; - candidate = "rc3"; + candidate = "rc5"; version = "${release_version}${candidate}"; # differentiating these (variables) is important for RCs targetConfig = stdenv.targetPlatform.config; @@ -15,7 +15,7 @@ let inherit sha256; }; - clang-tools-extra_src = fetch "clang-tools-extra" "0qmqzdiiq0prkn6gzzzhijjvmnj7n1h0y49lbw6c97l11frhishm"; + clang-tools-extra_src = fetch "clang-tools-extra" "0slqx5430pc699idabqnq34s9n0y2fq6q8z8hn5wakbi93dal71r"; tools = stdenv.lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); diff --git a/pkgs/development/compilers/llvm/11/libc++/default.nix b/pkgs/development/compilers/llvm/11/libc++/default.nix index e8ade7dda46..7a7cf06600b 100644 --- a/pkgs/development/compilers/llvm/11/libc++/default.nix +++ b/pkgs/development/compilers/llvm/11/libc++/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { pname = "libc++"; inherit version; - src = fetch "libcxx" "19lzg6n9vzcl9sk9xn2gbfnl4dzlhmxrm1d19ira1206xlmg39r7"; + src = fetch "libcxx" "1rlp8hx0nmqpx0gxq8hh9kqbkkzfpadx9chm47c38d4lahdksr1v"; postUnpack = '' unpackFile ${libcxxabi.src} diff --git a/pkgs/development/compilers/llvm/11/libc++abi.nix b/pkgs/development/compilers/llvm/11/libc++abi.nix index 62e45a89982..ba3b7fd9d92 100644 --- a/pkgs/development/compilers/llvm/11/libc++abi.nix +++ b/pkgs/development/compilers/llvm/11/libc++abi.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { pname = "libc++abi"; inherit version; - src = fetch "libcxxabi" "01m66bbx2r8mzbg1k2dk4wrma7rsm668h02drh0v1zcp943bx4ig"; + src = fetch "libcxxabi" "0214sl9m80hb8v0mdkrwl8l4ca3dvapis23mkld85bnxa8zq2c1q"; nativeBuildInputs = [ cmake ]; buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind; diff --git a/pkgs/development/compilers/llvm/11/libunwind.nix b/pkgs/development/compilers/llvm/11/libunwind.nix index 6e8c7647dca..0fc3fcabb33 100644 --- a/pkgs/development/compilers/llvm/11/libunwind.nix +++ b/pkgs/development/compilers/llvm/11/libunwind.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "libunwind"; inherit version; - src = fetch pname "1cs0bygglc70aadzhnackd0mamc16y01z2yxv9jglxd0r78gk0ff"; + src = fetch pname "1xw8y6agnix7qlwh676gm1kbkzh9c1nz7l3vhxjpazbk70biz9mq"; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/compilers/llvm/11/lld.nix b/pkgs/development/compilers/llvm/11/lld.nix index 750a2297f05..364fdb727d0 100644 --- a/pkgs/development/compilers/llvm/11/lld.nix +++ b/pkgs/development/compilers/llvm/11/lld.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "lld"; inherit version; - src = fetch pname "0d77y8nr69bhxhy719ynl52j5h3pjzm31lhyx5f9cpflqk80m5f8"; + src = fetch pname "1ibyahcxxckdfwh95f1dzxgcf1fsd0r9rpanm3dnn6nb99mn0is4"; nativeBuildInputs = [ cmake ]; buildInputs = [ llvm libxml2 ]; diff --git a/pkgs/development/compilers/llvm/11/lldb.nix b/pkgs/development/compilers/llvm/11/lldb.nix index 2d865460342..b7949692145 100644 --- a/pkgs/development/compilers/llvm/11/lldb.nix +++ b/pkgs/development/compilers/llvm/11/lldb.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (rec { pname = "lldb"; inherit version; - src = fetch pname "0j56f7nr8awqpn4ynib6qi0riz1x7d4jsl2vhdlizz2fvyxvn5is"; + src = fetch pname "1v8nvw6rxmi7w3ayjcjan4plb5ryhizc41sras7fza2l7n3cz8iz"; patches = [ ./lldb-procfs.patch ]; diff --git a/pkgs/development/compilers/llvm/11/llvm.nix b/pkgs/development/compilers/llvm/11/llvm.nix index aed0f08608f..b55ec1f0a10 100644 --- a/pkgs/development/compilers/llvm/11/llvm.nix +++ b/pkgs/development/compilers/llvm/11/llvm.nix @@ -32,8 +32,8 @@ in stdenv.mkDerivation (rec { pname = "llvm"; inherit version; - src = fetch pname "1f9ix9kvpr2nxwqbr73cwqvn9wsm5wlnza0hyji7z7pac8d2dxl6"; - polly_src = fetch "polly" "18ysra81fsyfcldydg0lxnwjhpd3kwxfdzvfx24dmgrykpbcqbi6"; + src = fetch pname "1k7i2syqdm29l10di3ws64i02snh9jhd1s2jzgh8565b0vg25wlc"; + polly_src = fetch "polly" "0l0n09f6sy30x825w85v8n7pvya0ciq89r0abv66n8ggwmrk3rnw"; unpackPhase = '' unpackFile $src diff --git a/pkgs/development/compilers/llvm/11/openmp.nix b/pkgs/development/compilers/llvm/11/openmp.nix index f4f9bbf2292..3cc19ad711d 100644 --- a/pkgs/development/compilers/llvm/11/openmp.nix +++ b/pkgs/development/compilers/llvm/11/openmp.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "openmp"; inherit version; - src = fetch pname "1025dwn68iw664df831zbkxy8bxilvjkbc6mw4nhv6p5ff7dcw7f"; + src = fetch pname "1yq7m0kwnlgq8ni719g9fny0x5wrvm8szp11b3q8zz39rqqyphsz"; nativeBuildInputs = [ cmake perl ]; buildInputs = [ llvm ];