movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-09 19:13:26 +03:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Revert "llvmPackages_20: 20.1.5 -> 20.1.6""

Browse source
This commit is contained in:
Tristan Ross 2025-06-08 20:27:25 -07:00 • committed by GitHub
parent bf7b973a2d
commit 11bcc51e07
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
pkgs/development/compilers/llvm/common/llvm/default.nix
View file

@ -294,17 +294,7 @@ stdenv.mkDerivation (
++ ++
lib.optional (lib.versionAtLeast release_version "15") lib.optional (lib.versionAtLeast release_version "15")
# Just like the `llvm-lit-cfg` patch, but for `polly`. # Just like the `llvm-lit-cfg` patch, but for `polly`.
(getVersionFile "llvm/polly-lit-cfg-add-libs-to-dylib-path.patch") (getVersionFile "llvm/polly-lit-cfg-add-libs-to-dylib-path.patch");
++
lib.optional (lib.versions.major release_version == "20")
# https://github.com/llvm/llvm-project/pull/139822 adds a commit which didn't get backported but is necessary for tests.
(
fetchpatch {
url = "https://github.com/llvm/llvm-project/commit/ff2e8f93f6090965e82d799af43f6dfef52baa66.patch";
stripLen = 1;
hash = "sha256-CZBTZKzi4cYkZhgTB5oXIo1UdEAArg9I4vR/m0upSRk=";
}
);
nativeBuildInputs = nativeBuildInputs =
[ [

2
pkgs/development/compilers/llvm/default.nix
View file

@ -31,7 +31,7 @@ let
"17.0.6".officialRelease.sha256 = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag="; "17.0.6".officialRelease.sha256 = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag=";
"18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE="; "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE=";
"19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I="; "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I=";
"20.1.5".officialRelease.sha256 = "sha256-WKfY+VvAsZEEc0xYgF6+MsXDXZz7haMU6bxqmUpaHuQ="; "20.1.6".officialRelease.sha256 = "sha256-PfCzECiCM+k0hHqEUSr1TSpnII5nqIxg+Z8ICjmMj0Y=";
"21.0.0-git".gitRelease = { "21.0.0-git".gitRelease = {
rev = "9e2684e4cfb0a7e30d5e49f812127d07cdda600d"; rev = "9e2684e4cfb0a7e30d5e49f812127d07cdda600d";
rev-version = "21.0.0-unstable-2025-06-06"; rev-version = "21.0.0-unstable-2025-06-06";