diff options
author | Luka Blaskovic <lblasc@tvbeat.com> | 2020-01-18 19:00:21 +0000 |
---|---|---|
committer | worldofpeace <worldofpeace@protonmail.ch> | 2020-01-30 18:35:30 -0500 |
commit | 0eafee83285b2287d5ddcd1598f2405667b7d09f (patch) | |
tree | 450009311acb6537d3e8d12ded1c498a6dae074a /pkgs/top-level | |
parent | c206bf12abb5464d5c7ce74c67d7190c66589358 (diff) | |
download | nixlib-0eafee83285b2287d5ddcd1598f2405667b7d09f.tar nixlib-0eafee83285b2287d5ddcd1598f2405667b7d09f.tar.gz nixlib-0eafee83285b2287d5ddcd1598f2405667b7d09f.tar.bz2 nixlib-0eafee83285b2287d5ddcd1598f2405667b7d09f.tar.lz nixlib-0eafee83285b2287d5ddcd1598f2405667b7d09f.tar.xz nixlib-0eafee83285b2287d5ddcd1598f2405667b7d09f.tar.zst nixlib-0eafee83285b2287d5ddcd1598f2405667b7d09f.zip |
llvm_39: remove
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 10 | ||||
-rw-r--r-- | pkgs/top-level/release.nix | 6 |
2 files changed, 0 insertions, 16 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 72d8f3d767b6..c779d1f22dbc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7827,7 +7827,6 @@ in clang_6 = llvmPackages_6.clang; clang_5 = llvmPackages_5.clang; clang_4 = llvmPackages_4.clang; - clang_39 = llvmPackages_39.clang; clang-tools = callPackage ../development/tools/clang-tools { llvmPackages = llvmPackages_latest; @@ -8546,18 +8545,9 @@ in llvm_6 = llvmPackages_6.llvm; llvm_5 = llvmPackages_5.llvm; llvm_4 = llvmPackages_4.llvm; - llvm_39 = llvmPackages_39.llvm; llvmPackages = recurseIntoAttrs llvmPackages_7; - llvmPackages_39 = callPackage ../development/compilers/llvm/3.9 ({ - inherit (stdenvAdapters) overrideCC; - buildLlvmTools = buildPackages.llvmPackages_39.tools; - targetLlvmLibraries = targetPackages.llvmPackages_39.libraries; - } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { - stdenv = gcc6Stdenv; - }); - llvmPackages_4 = callPackage ../development/compilers/llvm/4 ({ inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_4.tools; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 6ada2ca6d184..eceff2c53a46 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -76,8 +76,6 @@ let jobs.tests.cc-wrapper.x86_64-darwin jobs.tests.cc-wrapper-clang.x86_64-darwin jobs.tests.cc-wrapper-libcxx.x86_64-darwin - jobs.tests.cc-wrapper-clang-39.x86_64-darwin - jobs.tests.cc-wrapper-libcxx-39.x86_64-darwin jobs.tests.stdenv-inputs.x86_64-darwin jobs.tests.macOSSierraShared.x86_64-darwin jobs.tests.patch-shebangs.x86_64-darwin @@ -116,8 +114,6 @@ let jobs.tests.cc-wrapper-clang.x86_64-linux jobs.tests.cc-wrapper-libcxx.x86_64-linux - jobs.tests.cc-wrapper-clang-39.x86_64-linux - jobs.tests.cc-wrapper-libcxx-39.x86_64-linux jobs.tests.cc-wrapper-clang-4.x86_64-linux jobs.tests.cc-wrapper-libcxx-4.x86_64-linux jobs.tests.cc-wrapper-clang-5.x86_64-linux @@ -149,8 +145,6 @@ let # jobs.tests.cc-wrapper-gcc8.x86_64-darwin jobs.tests.cc-wrapper-clang.x86_64-darwin jobs.tests.cc-wrapper-libcxx.x86_64-darwin - jobs.tests.cc-wrapper-clang-39.x86_64-darwin - jobs.tests.cc-wrapper-libcxx-39.x86_64-darwin jobs.tests.cc-wrapper-clang-4.x86_64-darwin jobs.tests.cc-wrapper-libcxx-4.x86_64-darwin jobs.tests.cc-wrapper-clang-5.x86_64-darwin |