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

Merge pull request #84096 from DieGoldeneEnte/llvm-latest

Browse Source 
llvmPackages_latest: llvm9->llvm10
This commit is contained in:
Jörg Thalheim 2020-04-13 16:48:45 +01:00 committed by GitHub
commit a5661135f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -681,6 +681,11 @@ mapAliases ({
clang_35 = llvm_4;
clang_4 = llvm_4;
# added 2019-04-13
# *-polly pointed to llvmPackages_latest
llvm-polly = throw "clang is now built with polly-plugin by default";
clang-polly = throw "clang is now built with polly-plugin by default";
/* Cleanup before 20.09 */
oraclejdk8psu = throw ''
The *psu versions of oraclejdk aren't provided by upstream anymore and were therefore removed!

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

@ -8003,8 +8003,6 @@ in
useMacosReexportHack = true;
};
};
llvm-polly = llvmPackages_latest.llvm-polly;
clang-polly = llvmPackages_latest.clang.override { cc = llvmPackages_latest.clang-polly-unwrapped; };
clang_10 = llvmPackages_10.clang;
clang_9 = llvmPackages_9.clang;
@ -8801,7 +8799,7 @@ in
stdenv = gcc7Stdenv;
});
llvmPackages_latest = llvmPackages_9; # llvmPackages_10: when out of RC
llvmPackages_latest = llvmPackages_10;
lorri = callPackage ../tools/misc/lorri {
inherit (darwin.apple_sdk.frameworks) CoreServices Security;