From 19ca45e39f1dd7ec9f35cf836c7e7a3ff7f18304 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 1 May 2023 14:49:38 +0300 Subject: [PATCH 1/4] 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 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 From 064bcc58cd4013825212f558d1e64abfdab9154d Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 1 May 2023 14:34:05 +0300 Subject: [PATCH 2/4] vulkan-tools: 1.3.243 -> 1.3.249, remove vulkan-headers version check The tools build just fine with older/newer headers generally. --- pkgs/tools/graphics/vulkan-tools/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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); }; } From 07fd3ec5dfc0c34d4c0c63ee0b20f688250bb698 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 1 May 2023 14:35:48 +0300 Subject: [PATCH 3/4] vulkan-extension-layer: 1.3.243 -> 1.3.248, remove vulkan-headers version check --- pkgs/tools/graphics/vulkan-extension-layer/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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); }; } From a7d9cfdc03810645c2480ed63486a28a03c195ac Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 1 May 2023 14:41:42 +0300 Subject: [PATCH 4/4] vulkan-validation-layers: 1.3.243 -> 1.3.249 --- pkgs/development/tools/vulkan-validation-layers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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="; };