From aca6b30ddc5222985b3806fd7a00af953e80b241 Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 22 Aug 2025 18:53:28 +0100 Subject: [PATCH 1/3] spirv-headers: 1.4.321.0 -> 1.4.321.0-unstable-2025-06-24 This is required for the LLVM 21 bump. --- pkgs/by-name/sp/spirv-headers/package.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sp/spirv-headers/package.nix b/pkgs/by-name/sp/spirv-headers/package.nix index 6a4546588bf3..afa892972360 100644 --- a/pkgs/by-name/sp/spirv-headers/package.nix +++ b/pkgs/by-name/sp/spirv-headers/package.nix @@ -7,13 +7,16 @@ stdenv.mkDerivation rec { pname = "spirv-headers"; - version = "1.4.321.0"; + version = "1.4.321.0-unstable-2025-06-24"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "vulkan-sdk-${version}"; - hash = "sha256-LRjMy9xtOErbJbMh+g2IKXfmo/hWpegZM72F8E122oY="; + # The release for Vulkan SDK 1.4.321.0 is missing a PR required for + # LLVM 21 support in SPIRV-LLVM-Translator; return to the + # `vulkan-sdk-*` tags on the next stable release. + rev = "9e3836d7d6023843a72ecd3fbf3f09b1b6747a9e"; + hash = "sha256-N8NBAkkpOcbgap4loPJJW6E5bjG+TixCh/HN259RyjI="; }; nativeBuildInputs = [ cmake ]; From 6e4008fe94e8ac4ff46ade1a1d4a97841ee49ae2 Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 22 Aug 2025 18:53:28 +0100 Subject: [PATCH 2/3] spirv-tools: 1.4.321.0 -> 1.4.321.0-unstable-2025-06-25 Fix the build with the updated headers. --- pkgs/by-name/sp/spirv-tools/package.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sp/spirv-tools/package.nix b/pkgs/by-name/sp/spirv-tools/package.nix index f158e801d2dd..f0b6ec2362b1 100644 --- a/pkgs/by-name/sp/spirv-tools/package.nix +++ b/pkgs/by-name/sp/spirv-tools/package.nix @@ -9,13 +9,16 @@ stdenv.mkDerivation rec { pname = "spirv-tools"; - version = "1.4.321.0"; + version = "1.4.321.0-unstable-2025-06-25"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "vulkan-sdk-${version}"; - hash = "sha256-yAdd/mXY8EJnE0vCu0n/aVxMH9059T/7cAdB9nP1vQQ="; + # The SPIRV-Headers release for Vulkan SDK 1.4.321.0 is missing + # a PR required for LLVM 21 support in SPIRV-LLVM-Translator; + # return to the `vulkan-sdk-*` tags on the next stable release. + rev = "28a883ba4c67f58a9540fb0651c647bb02883622"; + hash = "sha256-yRzpEBGyTr9oovsh3TUnJsR/luHNAPkotcJFWh7R1Fc="; }; # The cmake options are sufficient for turning on static building, but not From 14181d999fd187bba034680a1e871544715b3bd9 Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 11 Sep 2025 16:46:32 +0100 Subject: [PATCH 3/3] spirv-llvm-translator: unmark broken for LLVM 21 --- pkgs/by-name/sp/spirv-llvm-translator/package.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/by-name/sp/spirv-llvm-translator/package.nix b/pkgs/by-name/sp/spirv-llvm-translator/package.nix index 603c99035382..7fab99fbb4b6 100644 --- a/pkgs/by-name/sp/spirv-llvm-translator/package.nix +++ b/pkgs/by-name/sp/spirv-llvm-translator/package.nix @@ -133,13 +133,5 @@ stdenv.mkDerivation { license = licenses.ncsa; platforms = platforms.unix; maintainers = with maintainers; [ gloaming ]; - - # For the LLVM 21 build some commits to spirv-headers - # are required that didn't make it into the final release of 1.4.321 - # For example: 9e3836d Add SPV_INTEL_function_variants - # Once spirv-headers are released again and updated on nixpkgs, - # this will switch over to the nixpkgs version and should no - # longer be broken. - broken = llvmMajor == "21" && lib.versionOlder spirv-headers.version "1.4.322"; }; }