From 11bcc51e079afb4e3abf5d35d7a262d4e8c88516 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Sun, 8 Jun 2025 20:27:25 -0700 Subject: [PATCH] Revert "Revert "llvmPackages_20: 20.1.5 -> 20.1.6"" --- .../compilers/llvm/common/llvm/default.nix | 12 +----------- pkgs/development/compilers/llvm/default.nix | 2 +- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix index e7d12650fa47..a605c17e492c 100644 --- a/pkgs/development/compilers/llvm/common/llvm/default.nix +++ b/pkgs/development/compilers/llvm/common/llvm/default.nix @@ -294,17 +294,7 @@ stdenv.mkDerivation ( ++ lib.optional (lib.versionAtLeast release_version "15") # Just like the `llvm-lit-cfg` patch, but for `polly`. - (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="; - } - ); + (getVersionFile "llvm/polly-lit-cfg-add-libs-to-dylib-path.patch"); nativeBuildInputs = [ diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 1762da6b16a8..9fc862c71751 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -31,7 +31,7 @@ let "17.0.6".officialRelease.sha256 = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag="; "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE="; "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 = { rev = "9e2684e4cfb0a7e30d5e49f812127d07cdda600d"; rev-version = "21.0.0-unstable-2025-06-06";