public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #115288 from symphorien/llvm-recurse

Browse Source
This commit is contained in:
Sandro 2021-03-27 18:54:56 +01:00 committed by GitHub
commit 9cc8c600c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/top-level/aliases.nix
View File

@ -100,6 +100,16 @@ mapAliases ({
cinepaint = throw "cinepaint has been removed from nixpkgs, as it was unmaintained"; # added 2019-12-10 cinepaint = throw "cinepaint has been removed from nixpkgs, as it was unmaintained"; # added 2019-12-10
cifs_utils = cifs-utils; # added 2016-08 cifs_utils = cifs-utils; # added 2016-08
ckb = ckb-next; # added 2018-10-21 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 clangAnalyzer = clang-analyzer; # added 2015-02-20
clawsMail = claws-mail; # added 2016-04-29 clawsMail = claws-mail; # added 2016-04-29
clutter_gtk = clutter-gtk; # added 2018-02-25 clutter_gtk = clutter-gtk; # added 2018-02-25

34
pkgs/top-level/all-packages.nix
View File

@ -10783,7 +10783,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
@ -10793,55 +10793,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;