llvmPackages_*: add recurseIntoAttrs

so that they appear in the search
This commit is contained in:
Symphorien Gibol 2021-03-06 20:37:05 +01:00
parent d496205cf2
commit 835a8f1cbc

View File

@ -10587,7 +10587,7 @@ in
llvm_6 = llvmPackages_6.llvm; llvm_6 = llvmPackages_6.llvm;
llvm_5 = llvmPackages_5.llvm; llvm_5 = llvmPackages_5.llvm;
llvmPackages = recurseIntoAttrs (with targetPlatform; llvmPackages = with targetPlatform;
if isDarwin then if isDarwin then
llvmPackages_7 llvmPackages_7
else if isFreeBSD then else if isFreeBSD then
@ -10597,55 +10597,55 @@ in
else if isWasm then else if isWasm then
llvmPackages_8 llvmPackages_8
else else
llvmPackages_latest); llvmPackages_latest;
llvmPackages_5 = callPackage ../development/compilers/llvm/5 { llvmPackages_5 = recurseIntoAttrs (callPackage ../development/compilers/llvm/5 {
inherit (stdenvAdapters) overrideCC; inherit (stdenvAdapters) overrideCC;
buildLlvmTools = buildPackages.llvmPackages_5.tools; buildLlvmTools = buildPackages.llvmPackages_5.tools;
targetLlvmLibraries = targetPackages.llvmPackages_5.libraries; targetLlvmLibraries = targetPackages.llvmPackages_5.libraries;
}; });
llvmPackages_6 = callPackage ../development/compilers/llvm/6 { llvmPackages_6 = recurseIntoAttrs (callPackage ../development/compilers/llvm/6 {
inherit (stdenvAdapters) overrideCC; inherit (stdenvAdapters) overrideCC;
buildLlvmTools = buildPackages.llvmPackages_6.tools; buildLlvmTools = buildPackages.llvmPackages_6.tools;
targetLlvmLibraries = targetPackages.llvmPackages_6.libraries; targetLlvmLibraries = targetPackages.llvmPackages_6.libraries;
}; });
llvmPackages_7 = callPackage ../development/compilers/llvm/7 { llvmPackages_7 = recurseIntoAttrs (callPackage ../development/compilers/llvm/7 {
inherit (stdenvAdapters) overrideCC; inherit (stdenvAdapters) overrideCC;
buildLlvmTools = buildPackages.llvmPackages_7.tools; buildLlvmTools = buildPackages.llvmPackages_7.tools;
targetLlvmLibraries = targetPackages.llvmPackages_7.libraries; targetLlvmLibraries = targetPackages.llvmPackages_7.libraries;
}; });
llvmPackages_8 = callPackage ../development/compilers/llvm/8 { llvmPackages_8 = recurseIntoAttrs (callPackage ../development/compilers/llvm/8 {
inherit (stdenvAdapters) overrideCC; inherit (stdenvAdapters) overrideCC;
buildLlvmTools = buildPackages.llvmPackages_8.tools; buildLlvmTools = buildPackages.llvmPackages_8.tools;
targetLlvmLibraries = targetPackages.llvmPackages_8.libraries; targetLlvmLibraries = targetPackages.llvmPackages_8.libraries;
}; });
llvmPackages_9 = callPackage ../development/compilers/llvm/9 { llvmPackages_9 = recurseIntoAttrs (callPackage ../development/compilers/llvm/9 {
inherit (stdenvAdapters) overrideCC; inherit (stdenvAdapters) overrideCC;
buildLlvmTools = buildPackages.llvmPackages_9.tools; buildLlvmTools = buildPackages.llvmPackages_9.tools;
targetLlvmLibraries = targetPackages.llvmPackages_9.libraries; targetLlvmLibraries = targetPackages.llvmPackages_9.libraries;
}; });
llvmPackages_10 = callPackage ../development/compilers/llvm/10 { llvmPackages_10 = recurseIntoAttrs (callPackage ../development/compilers/llvm/10 {
inherit (stdenvAdapters) overrideCC; inherit (stdenvAdapters) overrideCC;
buildLlvmTools = buildPackages.llvmPackages_10.tools; buildLlvmTools = buildPackages.llvmPackages_10.tools;
targetLlvmLibraries = targetPackages.llvmPackages_10.libraries; targetLlvmLibraries = targetPackages.llvmPackages_10.libraries;
}; });
llvmPackages_11 = callPackage ../development/compilers/llvm/11 ({ llvmPackages_11 = recurseIntoAttrs (callPackage ../development/compilers/llvm/11 ({
inherit (stdenvAdapters) overrideCC; inherit (stdenvAdapters) overrideCC;
buildLlvmTools = buildPackages.llvmPackages_11.tools; buildLlvmTools = buildPackages.llvmPackages_11.tools;
targetLlvmLibraries = targetPackages.llvmPackages_11.libraries; targetLlvmLibraries = targetPackages.llvmPackages_11.libraries;
} // lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) { } // lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) {
stdenv = gcc7Stdenv; stdenv = gcc7Stdenv;
}); }));
llvmPackages_latest = llvmPackages_11; llvmPackages_latest = llvmPackages_11;
llvmPackages_rocm = callPackage ../development/compilers/llvm/rocm { }; llvmPackages_rocm = recurseIntoAttrs (callPackage ../development/compilers/llvm/rocm { });
lorri = callPackage ../tools/misc/lorri { lorri = callPackage ../tools/misc/lorri {
inherit (darwin.apple_sdk.frameworks) CoreServices Security; inherit (darwin.apple_sdk.frameworks) CoreServices Security;