From 28ad34a7a6bca617dc591d9976fd61af982d1394 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Thu, 15 May 2025 01:34:51 -0700 Subject: [PATCH] llvmPackages_20: 20.1.4 -> 20.1.5 (cherry picked from commit bc8ee2f85190d32f939c8a6c028d70b9dc326ab7) --- .../compilers/llvm/common/llvm/default.nix | 12 +++++++++++- pkgs/development/compilers/llvm/default.nix | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix index a605c17e492c..e7d12650fa47 100644 --- a/pkgs/development/compilers/llvm/common/llvm/default.nix +++ b/pkgs/development/compilers/llvm/common/llvm/default.nix @@ -294,7 +294,17 @@ 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"); + (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 = [ diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 8800a6408c01..e88e419132b1 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.4".officialRelease.sha256 = "sha256-/WomqG2DdnUHwlVsMfpzaK/dhGV3zychfU0wLmihQac="; + "20.1.5".officialRelease.sha256 = "sha256-WKfY+VvAsZEEc0xYgF6+MsXDXZz7haMU6bxqmUpaHuQ="; "21.0.0-git".gitRelease = { rev = "5b91756c0ca7ef4d75c33c2617bfd0f9719907dc"; rev-version = "21.0.0-unstable-2025-05-11";