diff options
| author | Gabor Greif <ggreif@gmail.com> | 2020-03-05 12:34:01 +0100 |
|---|---|---|
| committer | Gabor Greif <ggreif@gmail.com> | 2020-03-07 20:11:59 +0100 |
| commit | 3a84353edb56a6167fb687f2fdc32cab48a65079 (patch) | |
| tree | 7d29e03dad7546f22a3fd4f0e6aa4c884dc4cada /pkgs/development/compilers/llvm/10/default.nix | |
| parent | 065b6d3ce452dcc7ec631bbc7c0e67e9f0993518 (diff) | |
| download | nixpkgs-3a84353edb56a6167fb687f2fdc32cab48a65079.tar nixpkgs-3a84353edb56a6167fb687f2fdc32cab48a65079.tar.gz nixpkgs-3a84353edb56a6167fb687f2fdc32cab48a65079.tar.bz2 nixpkgs-3a84353edb56a6167fb687f2fdc32cab48a65079.tar.lz nixpkgs-3a84353edb56a6167fb687f2fdc32cab48a65079.tar.xz nixpkgs-3a84353edb56a6167fb687f2fdc32cab48a65079.tar.zst nixpkgs-3a84353edb56a6167fb687f2fdc32cab48a65079.zip | |
llvmPackages_10: rc2 -> rc3
http://lists.llvm.org/pipermail/llvm-dev/2020-March/139729.html Additionally cherry-picked 3 commits from `llvm-project/master`: - llvm/llvm-project@d21664c - llvm/llvm-project@3a0f6e6 - llvm/llvm-project@87dac7d such that clang can automatically pick up the polly plugin from the `llvm-polly` build.
Diffstat (limited to 'pkgs/development/compilers/llvm/10/default.nix')
| -rw-r--r-- | pkgs/development/compilers/llvm/10/default.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/development/compilers/llvm/10/default.nix b/pkgs/development/compilers/llvm/10/default.nix index 0f9d302f7cf..f2a8883a9a7 100644 --- a/pkgs/development/compilers/llvm/10/default.nix +++ b/pkgs/development/compilers/llvm/10/default.nix @@ -6,7 +6,7 @@ let release_version = "10.0.0"; - candidate = "rc2"; + candidate = "rc3"; version = "10.0.0${candidate}"; # differentiating these is important for rc's fetch = name: sha256: fetchurl { @@ -14,7 +14,7 @@ let inherit sha256; }; - clang-tools-extra_src = fetch "clang-tools-extra" "1yi34b6lspcpig0gnws2ba0shgmrs2jgjb3hp08mm0dg3blzk8ss"; + clang-tools-extra_src = fetch "clang-tools-extra" "03669c93wzmbmfpv0pyzb7y4z1xc912l95iqywyx01xgdl1xws0r"; tools = stdenv.lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); @@ -39,7 +39,6 @@ let clang-polly-unwrapped = callPackage ./clang { inherit clang-tools-extra_src; llvm = tools.llvm-polly; - enablePolly = true; }; llvm-manpages = lowPrio (tools.llvm.override { |