diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-03-03 07:52:05 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-03-03 08:15:35 +0100 |
| commit | 92f454e73ceb61f3d18bc3ff9c466f0fab2405c5 (patch) | |
| tree | 6c6c4e8efe71438f461c71f0682ed41ba014d173 /pkgs/top-level | |
| parent | 3f116702cc1242e34d008a8f1793e6f542e79472 (diff) | |
| parent | 6f6c06adc1c0338e0125e7d5785b43223493f114 (diff) | |
Merge #23408: llvm: 4.0rc2 -> 4rc3
and rename attributes 4.0 -> 4
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3f2bfc5bda09..34341874e3a0 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; }; |