nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 06:53:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

llvmPackages.clang: limit backport to clang 15 and 16 (#348391)

Browse Source
This commit is contained in:
Emily 2024-10-14 18:32:48 +01:00 committed by GitHub
commit 7205ddc1ff
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/development/compilers/llvm/common/default.nix
View File

@ -541,7 +541,7 @@ let
})
]
# Backport version logic from Clang 16. This is needed by the following patch.
++ lib.optional (lib.versionOlder (lib.versions.major metadata.release_version) "16") (fetchpatch {
++ lib.optional (lib.versions.major metadata.release_version == "15") (fetchpatch {
name = "clang-darwin-Use-consistent-version-define-stringifying-logic.patch";
url = "https://github.com/llvm/llvm-project/commit/60a33ded751c86fff9ac1c4bdd2b341fbe4b0649.patch?full_index=1";
includes = [ "lib/Basic/Targets/OSTargets.cpp" ];
@ -550,13 +550,19 @@ let
})
# Backport `__ENVIRONMENT_OS_VERSION_MIN_REQUIRED__` support from Clang 17.
# This is needed by newer SDKs (14+).
++ lib.optional (lib.versionOlder (lib.versions.major metadata.release_version) "17") (fetchpatch {
name = "clang-darwin-An-OS-version-preprocessor-define.patch";
url = "https://github.com/llvm/llvm-project/commit/c8e2dd8c6f490b68e41fe663b44535a8a21dfeab.patch?full_index=1";
includes = [ "lib/Basic/Targets/OSTargets.cpp" ];
stripLen = 1;
hash = "sha256-Vs32kql7N6qtLqc12FtZHURcbenA7+N3E/nRRX3jdig=";
})
++
lib.optional
(
lib.versionAtLeast (lib.versions.major metadata.release_version) "15"
&& lib.versionOlder (lib.versions.major metadata.release_version) "17"
)
(fetchpatch {
name = "clang-darwin-An-OS-version-preprocessor-define.patch";
url = "https://github.com/llvm/llvm-project/commit/c8e2dd8c6f490b68e41fe663b44535a8a21dfeab.patch?full_index=1";
includes = [ "lib/Basic/Targets/OSTargets.cpp" ];
stripLen = 1;
hash = "sha256-Vs32kql7N6qtLqc12FtZHURcbenA7+N3E/nRRX3jdig=";
})
++ lib.optional (lib.versions.major metadata.release_version == "18") (fetchpatch {
name = "tweak-tryCaptureVariable-for-unevaluated-lambdas.patch";
url = "https://github.com/llvm/llvm-project/commit/3d361b225fe89ce1d8c93639f27d689082bd8dad.patch";