From 835a8f1cbc50f8fd6955deea9f0373f1a5ca440a Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Sat, 6 Mar 2021 20:37:05 +0100 Subject: [PATCH 1/2] llvmPackages_*: add recurseIntoAttrs so that they appear in the search --- pkgs/top-level/all-packages.nix | 34 ++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index afba3f5a371..ac8df3a987f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10587,7 +10587,7 @@ in llvm_6 = llvmPackages_6.llvm; llvm_5 = llvmPackages_5.llvm; - llvmPackages = recurseIntoAttrs (with targetPlatform; + llvmPackages = with targetPlatform; if isDarwin then llvmPackages_7 else if isFreeBSD then @@ -10597,55 +10597,55 @@ in else if isWasm then llvmPackages_8 else - llvmPackages_latest); + llvmPackages_latest; - llvmPackages_5 = callPackage ../development/compilers/llvm/5 { + llvmPackages_5 = recurseIntoAttrs (callPackage ../development/compilers/llvm/5 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_5.tools; targetLlvmLibraries = targetPackages.llvmPackages_5.libraries; - }; + }); - llvmPackages_6 = callPackage ../development/compilers/llvm/6 { + llvmPackages_6 = recurseIntoAttrs (callPackage ../development/compilers/llvm/6 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_6.tools; targetLlvmLibraries = targetPackages.llvmPackages_6.libraries; - }; + }); - llvmPackages_7 = callPackage ../development/compilers/llvm/7 { + llvmPackages_7 = recurseIntoAttrs (callPackage ../development/compilers/llvm/7 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_7.tools; targetLlvmLibraries = targetPackages.llvmPackages_7.libraries; - }; + }); - llvmPackages_8 = callPackage ../development/compilers/llvm/8 { + llvmPackages_8 = recurseIntoAttrs (callPackage ../development/compilers/llvm/8 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_8.tools; targetLlvmLibraries = targetPackages.llvmPackages_8.libraries; - }; + }); - llvmPackages_9 = callPackage ../development/compilers/llvm/9 { + llvmPackages_9 = recurseIntoAttrs (callPackage ../development/compilers/llvm/9 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_9.tools; targetLlvmLibraries = targetPackages.llvmPackages_9.libraries; - }; + }); - llvmPackages_10 = callPackage ../development/compilers/llvm/10 { + llvmPackages_10 = recurseIntoAttrs (callPackage ../development/compilers/llvm/10 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_10.tools; targetLlvmLibraries = targetPackages.llvmPackages_10.libraries; - }; + }); - llvmPackages_11 = callPackage ../development/compilers/llvm/11 ({ + llvmPackages_11 = recurseIntoAttrs (callPackage ../development/compilers/llvm/11 ({ inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_11.tools; targetLlvmLibraries = targetPackages.llvmPackages_11.libraries; } // lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) { stdenv = gcc7Stdenv; - }); + })); llvmPackages_latest = llvmPackages_11; - llvmPackages_rocm = callPackage ../development/compilers/llvm/rocm { }; + llvmPackages_rocm = recurseIntoAttrs (callPackage ../development/compilers/llvm/rocm { }); lorri = callPackage ../tools/misc/lorri { inherit (darwin.apple_sdk.frameworks) CoreServices Security; From 1906aacec33eec5780136fed3058a4a91998d762 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Sat, 6 Mar 2021 20:37:44 +0100 Subject: [PATCH 2/2] add clang${n}Stdenv aliases, just like gcc${n}Stdenv --- pkgs/top-level/aliases.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 84adc261adc..202684c2f89 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -99,6 +99,16 @@ mapAliases ({ cinepaint = throw "cinepaint has been removed from nixpkgs, as it was unmaintained"; # added 2019-12-10 cifs_utils = cifs-utils; # added 2016-08 ckb = ckb-next; # added 2018-10-21 + + # these are for convenience, not for backward compat and shouldn't expire + clang5Stdenv = lowPrio llvmPackages_5.stdenv; + clang6Stdenv = lowPrio llvmPackages_6.stdenv; + clang7Stdenv = lowPrio llvmPackages_7.stdenv; + clang8Stdenv = lowPrio llvmPackages_8.stdenv; + clang9Stdenv = lowPrio llvmPackages_9.stdenv; + clang10Stdenv = lowPrio llvmPackages_10.stdenv; + clang11Stdenv = lowPrio llvmPackages_11.stdenv; + clangAnalyzer = clang-analyzer; # added 2015-02-20 clawsMail = claws-mail; # added 2016-04-29 clutter_gtk = clutter-gtk; # added 2018-02-25