diff --git a/pkgs/development/libraries/vulkan-headers/update.sh b/pkgs/development/libraries/vulkan-headers/update.sh index 9857af699e2f..b61be25ca2e7 100755 --- a/pkgs/development/libraries/vulkan-headers/update.sh +++ b/pkgs/development/libraries/vulkan-headers/update.sh @@ -1,23 +1,29 @@ #!/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 diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix index 81be07fdcd0d..9927a3a4baed 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -23,7 +23,7 @@ let 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". @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ValidationLayers"; - rev = "sdk-${version}"; + rev = "v${version}"; hash = "sha256-viVceH8qFz6Cl/RlMMWZnMIdzULELlnIvtPZ87ySs2M="; }; diff --git a/pkgs/tools/graphics/vulkan-extension-layer/default.nix b/pkgs/tools/graphics/vulkan-extension-layer/default.nix index 37de2d20aafc..81e2f329d1b5 100644 --- a/pkgs/tools/graphics/vulkan-extension-layer/default.nix +++ b/pkgs/tools/graphics/vulkan-extension-layer/default.nix @@ -2,13 +2,13 @@ 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 ]; @@ -40,6 +40,5 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.asl20; maintainers = with maintainers; [ expipiplus1 ]; - broken = (version != vulkan-headers.version); }; } diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix index 47a17158653f..d3ffe35ff964 100644 --- a/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -21,13 +21,13 @@ 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 = [ @@ -103,6 +103,5 @@ stdenv.mkDerivation rec { platforms = platforms.unix; license = licenses.asl20; maintainers = [ maintainers.ralith ]; - broken = (version != vulkan-headers.version); }; }