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

llvmPackages_13: 13.0.0-rc1 -> 13.0.0-rc2

Browse Source 
Upstream backported 5060224d9eed8b8359ed5090bb7c577b8575e9e7:
93da37dc58
This commit is contained in:
Michael Weiss 2021-08-27 16:55:21 +02:00
parent 21c937f8cb
commit bac15390f5
No known key found for this signature in database
GPG Key ID: 5BE487C4D4771D83
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/llvm/13/default.nix
View File

@ -19,7 +19,7 @@
let
release_version = "13.0.0";
candidate = "rc1"; # empty or "rcN"
candidate = "rc2"; # empty or "rcN"
dash-candidate = lib.optionalString (candidate != "") "-${candidate}";
rev = ""; # When using a Git commit
rev-version = ""; # When using a Git commit
@ -30,7 +30,7 @@ let
owner = "llvm";
repo = "llvm-project";
rev = if rev != "" then rev else "llvmorg-${version}";
sha256 = "19x8yk9zkpdmn08r1jn3bk1l5ab7kgj9fi5v7lmkyahc19wxszy4";
sha256 = "06cy6v231w067g310bwpk6a654j6q9rcxa0y0wz5sc5rrh61zjrn";
};
llvm_meta = {

7
pkgs/development/compilers/llvm/13/llvm/default.nix
View File

@ -59,13 +59,6 @@ in stdenv.mkDerivation (rec {
sha256 = "18l6mrvm2vmwm77ckcnbjvh6ybvn72rhrb799d4qzwac4x2ifl7g";
stripLen = 1;
})
# Fix tests on non-x86 platforms: https://reviews.llvm.org/D107020
(fetchpatch {
url = "https://github.com/llvm/llvm-project/commit/5060224d9eed8b8359ed5090bb7c577b8575e9e7.patch";
sha256 = "1s2n3pqa11pmlifys1jkppmw858p5i64xszpc8ppc98middv19v1";
stripLen = 1;
})
] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch;
postPatch = optionalString stdenv.isDarwin ''