From 19ca45e39f1dd7ec9f35cf836c7e7a3ff7f18304 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 1 May 2023 14:49:38 +0300 Subject: [PATCH] vulkan/update-script: always update to latest upstream tags Only the loader and the headers need to stay in sync, everything else is fine being mismatched, and this way we're not stuck to the LunarG release cycles. --- .../libraries/vulkan-headers/update.sh | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/vulkan-headers/update.sh b/pkgs/development/libraries/vulkan-headers/update.sh index 9857af699e2..b61be25ca2e 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