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

Merge pull request #329058 from ExpidusOS/feat/llvm-git-2024-07-21

Browse Source 
llvmPackages_git: 19.0.0-git-2024-07-14 -> 19.0.0-git-2024-07-21
This commit is contained in:
Tristan Ross
2024-07-22 21:32:11 -07:00
committed by GitHub
parent 2874fc48cc 2deb3dd45f
commit a366f00ec4
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/llvm/common/default.nix
+8 -3
View File
@@ -361,8 +361,7 @@ let
# See here for some context:
# https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132
++ lib.optional (
stdenv.targetPlatform.isDarwin
&& lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0"
stdenv.targetPlatform.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0"
) (metadata.getVersionFile "lldb/cpu_subtype_arm64e_replacement.patch");
}
// lib.optionalAttrs (lib.versions.major metadata.release_version == "16") {
@@ -592,7 +591,13 @@ let
./compiler-rt/armv6-no-ldrexd-strexd.patch
./compiler-rt/armv6-scudo-no-yield.patch
./compiler-rt/armv6-scudo-libatomic.patch
];
]
++ lib.optional (lib.versionAtLeast metadata.release_version "19") (
fetchpatch {
url = "https://github.com/llvm/llvm-project/pull/99837/commits/14ae0a660a38e1feb151928a14f35ff0f4487351.patch";
hash = "sha256-1CkA+RzI+645uG/QXsmOMKrLAjhVpfLUjNtgZ0QTv1E=";
}
);
in
{
compiler-rt-libc = callPackage ./compiler-rt {
pkgs/development/compilers/llvm/default.nix
+3 -3
View File
@@ -23,9 +23,9 @@ let
"17.0.6".officialRelease.sha256 = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag=";
"18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE=";
"19.0.0-git".gitRelease = {
rev = "8da3852f44c64ac4535128741695b9e9d8ee27ef";
rev-version = "19.0.0-unstable-2024-07-14";
sha256 = "sha256-yGmbzueu1kkfGbQaIG+ImnpIS+RwaUl/Gx/+1w6SHRc=";
rev = "d15ada24b1fbbd72776022383a5c557a1a056413";
rev-version = "19.0.0-unstable-2024-07-21";
sha256 = "sha256-ZvsHGgbcSwE0Ko8KjvRzKQLkig6VcQD7/A2XClq+kt0=";
};
} // llvmVersions;