Merge pull request #229273 from K900/more-vulkan-updates

More vulkan updates

pkgs/development/libraries/vulkan-headers/update.sh

···
 #!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl jq nix-update
+#!nix-shell -i bash -p nix-update
 
 set -euf -o pipefail
 
-NEW_VERSION=$(curl https://vulkan.lunarg.com/sdk/latest/linux.json | jq -r '.linux')
-
-VULKAN_SDK_PACKAGES=(
+V_PACKAGES=(
     "vulkan-headers"
-    "spirv-headers"
-    "glslang"
     "vulkan-loader"
     "spirv-tools"
-    "spirv-cross"
     "vulkan-validation-layers"
     "vulkan-tools"
     "vulkan-tools-lunarg"
     "vulkan-extension-layer"
 )
 
-for P in "${VULKAN_SDK_PACKAGES[@]}"; do
-    nix-update "$P" --version "$NEW_VERSION" --commit
+SDK_PACKAGES=(
+    "spirv-headers"
+    "spirv-cross"
+)
+
+nix-update glslang --version-regex '(\d+\.\d+\.\d+)' --commit
+
+for P in "${V_PACKAGES[@]}"; do
+    nix-update "$P" --version-regex "(?:v)(.*)" --commit
+done
+
+for P in "${SDK_PACKAGES[@]}"; do
+    nix-update "$P" --version-regex "(?:sdk-)(.*)" --commit
 done

pkgs/development/tools/vulkan-validation-layers/default.nix

···
 in
 stdenv.mkDerivation rec {
   pname = "vulkan-validation-layers";
-  version = "1.3.243.0";
+  version = "1.3.249";
 
   # If we were to use "dev" here instead of headers, the setupHook would be
   # placed in that output instead of "out".
···
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "Vulkan-ValidationLayers";
-    rev = "sdk-${version}";
+    rev = "v${version}";
     hash = "sha256-viVceH8qFz6Cl/RlMMWZnMIdzULELlnIvtPZ87ySs2M=";
   };
 

pkgs/tools/graphics/vulkan-extension-layer/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "vulkan-extension-layer";
-  version = "1.3.243.0";
+  version = "1.3.248";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "Vulkan-ExtensionLayer";
-    rev = "sdk-${version}";
-    hash = "sha256-hxlfSnH4M3ui5nW0Ll5rhto0DnJIHW0tJzS+p4KV0R4=";
+    rev = "v${version}";
+    hash = "sha256-CuwYpB8HX8pnR+ElkQfckpKDLKyZIzqm4F9kluM1cKo=";
   };
 
   nativeBuildInputs = [ cmake jq ];
···
     platforms = platforms.linux;
     license = licenses.asl20;
     maintainers = with maintainers; [ expipiplus1 ];
-    broken = (version != vulkan-headers.version);
   };
 }

pkgs/tools/graphics/vulkan-tools/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "vulkan-tools";
-  version = "1.3.243.0";
+  version = "1.3.249";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "Vulkan-Tools";
-    rev = "sdk-${version}";
-    hash = "sha256-8XJON+iBEPRtuQWf1bPXyOJHRkuRLnLXgTIjk7gYQwE=";
+    rev = "v${version}";
+    hash = "sha256-+d0Yp+e/wzlRmUIs4SffiphkqmM/7avJrt3JNOgO19I=";
   };
 
   nativeBuildInputs = [
···
     platforms   = platforms.unix;
     license     = licenses.asl20;
     maintainers = [ maintainers.ralith ];
-    broken = (version != vulkan-headers.version);
   };
 }