From 5e267f657da817bb3ef16c4c1030aac0bfe49735 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 2 Mar 2017 16:25:07 -0600 Subject: [PATCH 1/2] llvm4.0: rc2 -> rc3 Also add myself to maintainers for LLVM. --- pkgs/development/compilers/llvm/4.0/clang/default.nix | 2 +- pkgs/development/compilers/llvm/4.0/default.nix | 6 +++--- pkgs/development/compilers/llvm/4.0/libc++/default.nix | 4 ++-- pkgs/development/compilers/llvm/4.0/libc++abi.nix | 2 +- pkgs/development/compilers/llvm/4.0/lld.nix | 2 +- pkgs/development/compilers/llvm/4.0/lldb.nix | 2 +- pkgs/development/compilers/llvm/4.0/llvm.nix | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/development/compilers/llvm/4.0/clang/default.nix b/pkgs/development/compilers/llvm/4.0/clang/default.nix index f566cd6d21c..5be8ffd91cf 100644 --- a/pkgs/development/compilers/llvm/4.0/clang/default.nix +++ b/pkgs/development/compilers/llvm/4.0/clang/default.nix @@ -6,7 +6,7 @@ let name = "clang-${version}"; unpackPhase = '' - unpackFile ${fetch "cfe" "1p55db1yfya60r2fnr9bh8pj8fqq5gjc1fnv0c1kmac8yfvwkmkn"} + unpackFile ${fetch "cfe" "1lsdyrz82vyrsc7k0ah1zmzzan61s5kakxrkxgfbmklp3pclfkwp"} mv cfe-${version}* clang sourceRoot=$PWD/clang unpackFile ${clang-tools-extra_src} diff --git a/pkgs/development/compilers/llvm/4.0/default.nix b/pkgs/development/compilers/llvm/4.0/default.nix index f407b2cdc9f..349545a2959 100644 --- a/pkgs/development/compilers/llvm/4.0/default.nix +++ b/pkgs/development/compilers/llvm/4.0/default.nix @@ -3,7 +3,7 @@ let callPackage = newScope (self // { inherit stdenv isl release_version version fetch; }); release_version = "4.0.0"; - rc = "rc2"; + rc = "rc3"; version = "${release_version}${rc}"; fetch = name: sha256: fetchurl { @@ -13,8 +13,8 @@ let inherit sha256; }; - compiler-rt_src = fetch "compiler-rt" "07i098rj41h1sq2f30d6161924zr5yd9gx5kans79p7akxxgc0jr"; - clang-tools-extra_src = fetch "clang-tools-extra" "0ypvkv55pw88iaixib29sgz44d4pfs166vpswnrrbkqlhz92ns0z"; + compiler-rt_src = fetch "compiler-rt" "0jfqhz95cp15c5688c6l9mr12s0qp86milpcrjlc93dc2jy08ba5"; + clang-tools-extra_src = fetch "clang-tools-extra" "1c9c507w3f5vm153rdd0kmzvv2ski6z439izk01zf5snfwkqxkq8"; self = { llvm = callPackage ./llvm.nix { diff --git a/pkgs/development/compilers/llvm/4.0/libc++/default.nix b/pkgs/development/compilers/llvm/4.0/libc++/default.nix index 9f950e601b2..57e064fb79a 100644 --- a/pkgs/development/compilers/llvm/4.0/libc++/default.nix +++ b/pkgs/development/compilers/llvm/4.0/libc++/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "libc++-${version}"; - src = fetch "libcxx" "130clvfffqml8hbnlvr596nfjk18n6ifxab27xl66nxhq99wccfn"; + src = fetch "libcxx" "15l6bcmwczspbqcq4m2lmzb23g11axr9m8dayn25iys26nn00q43"; postUnpack = '' unpackFile ${libcxxabi.src} @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; patchPhase = '' - substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++" + substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++" ''; buildInputs = [ cmake llvm libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; diff --git a/pkgs/development/compilers/llvm/4.0/libc++abi.nix b/pkgs/development/compilers/llvm/4.0/libc++abi.nix index 362663ed443..fc1a6d84caa 100644 --- a/pkgs/development/compilers/llvm/4.0/libc++abi.nix +++ b/pkgs/development/compilers/llvm/4.0/libc++abi.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libc++abi-${version}"; - src = fetch "libcxxabi" "09hlqlbxpnqi3449nrk43khp4jgd34xwx406mw6igwl8a673pa85"; + src = fetch "libcxxabi" "1frj1wz780xcwq77icfclnw6q4c8bkkdzkqsrmfjv9963kjylsy5"; buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; diff --git a/pkgs/development/compilers/llvm/4.0/lld.nix b/pkgs/development/compilers/llvm/4.0/lld.nix index 004230ca81a..7fe08cb0262 100644 --- a/pkgs/development/compilers/llvm/4.0/lld.nix +++ b/pkgs/development/compilers/llvm/4.0/lld.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { name = "lld-${version}"; - src = fetch "lld" "144vmb13800s33xgd18321lrviw21mjx5dphzszjgvizn4a1sf1p"; + src = fetch "lld" "0kmyp7iyf4f76wgy87jczkyhvzhlwfydvxgggl74z0x89xgry745"; buildInputs = [ cmake llvm ]; diff --git a/pkgs/development/compilers/llvm/4.0/lldb.nix b/pkgs/development/compilers/llvm/4.0/lldb.nix index f37e6fdfafc..23667e6afcd 100644 --- a/pkgs/development/compilers/llvm/4.0/lldb.nix +++ b/pkgs/development/compilers/llvm/4.0/lldb.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { name = "lldb-${version}"; - src = fetch "lldb" "0g3il7bz1b0xbcm85c6r64vgn8ppxigi1s39s3xzga4pkllf7k07"; + src = fetch "lldb" "1qr0ky7llwgjgx1pzkp3pnz32nb6f7lvg8qg6rp5axhgpkx54hz7"; patchPhase = '' # Fix up various paths that assume llvm and clang are installed in the same place diff --git a/pkgs/development/compilers/llvm/4.0/llvm.nix b/pkgs/development/compilers/llvm/4.0/llvm.nix index d54390e5ee8..2d36f7cd0fb 100644 --- a/pkgs/development/compilers/llvm/4.0/llvm.nix +++ b/pkgs/development/compilers/llvm/4.0/llvm.nix @@ -21,7 +21,7 @@ }: let - src = fetch "llvm" "1qfvvblca2aa5shamz66132k30hmpq2mkpfn172xzzlm6znzlmr2"; + src = fetch "llvm" "0ic3y9gaissi6ixyj9x1c0pq69wfbl2svhprp33av0b58f7wj9v7"; shlib = if stdenv.isDarwin then "dylib" else "so"; # Used when creating a version-suffixed symlink of libLLVM.dylib @@ -111,7 +111,7 @@ in stdenv.mkDerivation rec { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = http://llvm.org/; license = stdenv.lib.licenses.ncsa; - maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ]; + maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric dtzWill ]; platforms = stdenv.lib.platforms.all; }; } From 6f6c06adc1c0338e0125e7d5785b43223493f114 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 2 Mar 2017 16:51:32 -0600 Subject: [PATCH 2/2] llvm4.0: Rename "4.0" (and _40) to "4" (and _4). This reflects upstream versioning change, and allows us to replace 4.0 with 4.1 (which is now a minor revision) without changing the attribute name. Thanks to @vcunat for the idea. --- .../compilers/llvm/{4.0 => 4}/clang/default.nix | 0 .../compilers/llvm/{4.0 => 4}/clang/purity.patch | 0 pkgs/development/compilers/llvm/{4.0 => 4}/default.nix | 2 +- .../compilers/llvm/{4.0 => 4}/libc++/default.nix | 0 .../compilers/llvm/{4.0 => 4}/libc++/setup-hook.sh | 0 pkgs/development/compilers/llvm/{4.0 => 4}/libc++abi.nix | 0 pkgs/development/compilers/llvm/{4.0 => 4}/lld.nix | 0 pkgs/development/compilers/llvm/{4.0 => 4}/lldb.nix | 0 .../compilers/llvm/{4.0 => 4}/llvm-outputs.patch | 0 pkgs/development/compilers/llvm/{4.0 => 4}/llvm.nix | 0 pkgs/top-level/all-packages.nix | 8 ++++---- 11 files changed, 5 insertions(+), 5 deletions(-) rename pkgs/development/compilers/llvm/{4.0 => 4}/clang/default.nix (100%) rename pkgs/development/compilers/llvm/{4.0 => 4}/clang/purity.patch (100%) rename pkgs/development/compilers/llvm/{4.0 => 4}/default.nix (96%) rename pkgs/development/compilers/llvm/{4.0 => 4}/libc++/default.nix (100%) rename pkgs/development/compilers/llvm/{4.0 => 4}/libc++/setup-hook.sh (100%) rename pkgs/development/compilers/llvm/{4.0 => 4}/libc++abi.nix (100%) rename pkgs/development/compilers/llvm/{4.0 => 4}/lld.nix (100%) rename pkgs/development/compilers/llvm/{4.0 => 4}/lldb.nix (100%) rename pkgs/development/compilers/llvm/{4.0 => 4}/llvm-outputs.patch (100%) rename pkgs/development/compilers/llvm/{4.0 => 4}/llvm.nix (100%) diff --git a/pkgs/development/compilers/llvm/4.0/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix similarity index 100% rename from pkgs/development/compilers/llvm/4.0/clang/default.nix rename to pkgs/development/compilers/llvm/4/clang/default.nix diff --git a/pkgs/development/compilers/llvm/4.0/clang/purity.patch b/pkgs/development/compilers/llvm/4/clang/purity.patch similarity index 100% rename from pkgs/development/compilers/llvm/4.0/clang/purity.patch rename to pkgs/development/compilers/llvm/4/clang/purity.patch diff --git a/pkgs/development/compilers/llvm/4.0/default.nix b/pkgs/development/compilers/llvm/4/default.nix similarity index 96% rename from pkgs/development/compilers/llvm/4.0/default.nix rename to pkgs/development/compilers/llvm/4/default.nix index 349545a2959..cbb3852057d 100644 --- a/pkgs/development/compilers/llvm/4.0/default.nix +++ b/pkgs/development/compilers/llvm/4/default.nix @@ -8,7 +8,7 @@ let fetch = name: sha256: fetchurl { url = "http://llvm.org/pre-releases/${release_version}/${rc}/${name}-${version}.src.tar.xz"; - # Once 4.0 is released, use this instead: + # Once 4 is released, use this instead: # url = "http://llvm.org/releases/${release-version}/${name}-${version}.src.tar.xz"; inherit sha256; }; diff --git a/pkgs/development/compilers/llvm/4.0/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix similarity index 100% rename from pkgs/development/compilers/llvm/4.0/libc++/default.nix rename to pkgs/development/compilers/llvm/4/libc++/default.nix diff --git a/pkgs/development/compilers/llvm/4.0/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/4/libc++/setup-hook.sh similarity index 100% rename from pkgs/development/compilers/llvm/4.0/libc++/setup-hook.sh rename to pkgs/development/compilers/llvm/4/libc++/setup-hook.sh diff --git a/pkgs/development/compilers/llvm/4.0/libc++abi.nix b/pkgs/development/compilers/llvm/4/libc++abi.nix similarity index 100% rename from pkgs/development/compilers/llvm/4.0/libc++abi.nix rename to pkgs/development/compilers/llvm/4/libc++abi.nix diff --git a/pkgs/development/compilers/llvm/4.0/lld.nix b/pkgs/development/compilers/llvm/4/lld.nix similarity index 100% rename from pkgs/development/compilers/llvm/4.0/lld.nix rename to pkgs/development/compilers/llvm/4/lld.nix diff --git a/pkgs/development/compilers/llvm/4.0/lldb.nix b/pkgs/development/compilers/llvm/4/lldb.nix similarity index 100% rename from pkgs/development/compilers/llvm/4.0/lldb.nix rename to pkgs/development/compilers/llvm/4/lldb.nix diff --git a/pkgs/development/compilers/llvm/4.0/llvm-outputs.patch b/pkgs/development/compilers/llvm/4/llvm-outputs.patch similarity index 100% rename from pkgs/development/compilers/llvm/4.0/llvm-outputs.patch rename to pkgs/development/compilers/llvm/4/llvm-outputs.patch diff --git a/pkgs/development/compilers/llvm/4.0/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix similarity index 100% rename from pkgs/development/compilers/llvm/4.0/llvm.nix rename to pkgs/development/compilers/llvm/4/llvm.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f1968ebf40..75fef2685a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4759,7 +4759,7 @@ with pkgs; clang = llvmPackages.clang; - clang_40 = lowPrio llvmPackages_40.clang; + clang_4 = lowPrio llvmPackages_4.clang; clang_39 = llvmPackages_39.clang; clang_38 = llvmPackages_38.clang; clang_37 = llvmPackages_37.clang; @@ -5314,13 +5314,13 @@ with pkgs; lizardfs = callPackage ../tools/filesystems/lizardfs { }; - lld = lowPrio llvmPackages_40.lld; + lld = lowPrio llvmPackages_4.lld; lldb = llvmPackages.lldb; llvm = llvmPackages.llvm; - llvm_40 = lowPrio llvmPackages_40.llvm; + llvm_4 = lowPrio llvmPackages_4.llvm; llvm_39 = llvmPackages_39.llvm; llvm_38 = llvmPackages_38.llvm; llvm_37 = llvmPackages_37.llvm; @@ -5358,7 +5358,7 @@ with pkgs; inherit (stdenvAdapters) overrideCC; }; - llvmPackages_40 = callPackage ../development/compilers/llvm/4.0 { + llvmPackages_4 = callPackage ../development/compilers/llvm/4 { inherit (stdenvAdapters) overrideCC; };