From 42a4514475d78b84ca77c32cc5896a8f0ad14d90 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 15 Jan 2025 10:56:38 +0300 Subject: [PATCH 01/12] glslang: 15.0.0 -> 15.1.0 Diff: https://github.com/KhronosGroup/glslang/compare/15.0.0...15.1.0 --- pkgs/by-name/gl/glslang/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gl/glslang/package.nix b/pkgs/by-name/gl/glslang/package.nix index bc57fca1a9ecc..6feecafc1612a 100644 --- a/pkgs/by-name/gl/glslang/package.nix +++ b/pkgs/by-name/gl/glslang/package.nix @@ -11,13 +11,13 @@ }: stdenv.mkDerivation rec { pname = "glslang"; - version = "15.0.0"; + version = "15.1.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; rev = version; - hash = "sha256-QXNecJ6SDeWpRjzHRTdPJHob1H3q2HZmWuL2zBt2Tlw="; + hash = "sha256-E1Zenf7XSGoozx4hxdOlMu+XZ6mJROSu7jIVYPWe3go="; }; outputs = [ From cbb703b0611f3b8277ddac3a975257166d447e15 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 15 Jan 2025 10:56:43 +0300 Subject: [PATCH 02/12] vulkan-headers: 1.3.296.0 -> 1.4.304.0 Diff: https://github.com/KhronosGroup/Vulkan-Headers/compare/vulkan-sdk-1.3.296.0...vulkan-sdk-1.4.304.0 --- pkgs/development/libraries/vulkan-headers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix index b44f50c8b381c..047a8e9d44759 100644 --- a/pkgs/development/libraries/vulkan-headers/default.nix +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation rec { pname = "vulkan-headers"; - version = "1.3.296.0"; + version = "1.4.304.0"; # Adding `ninja` here to enable Ninja backend. Otherwise on gcc-14 or # later the build fails as: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-Headers"; rev = "vulkan-sdk-${version}"; - hash = "sha256-u/40rOQyYbQza0aYbechLdKhYM1DgoMKkxauW2zZ/w0="; + hash = "sha256-X6HqcZDZ4ZQGBG3PlSxi0mhmYyrjmJYwk/pJ/XBqEZU="; }; passthru.updateScript = ./update.sh; From d9f8dc86db7a32ae00d92c691807487a2f9bbbb2 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 15 Jan 2025 10:56:47 +0300 Subject: [PATCH 03/12] vulkan-loader: 1.3.296.0 -> 1.4.304.0 Diff: https://github.com/KhronosGroup/Vulkan-Loader/compare/vulkan-sdk-1.3.296.0...vulkan-sdk-1.4.304.0 --- pkgs/by-name/vu/vulkan-loader/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vu/vulkan-loader/package.nix b/pkgs/by-name/vu/vulkan-loader/package.nix index 96ad2fa8407ec..10993aa0e20be 100644 --- a/pkgs/by-name/vu/vulkan-loader/package.nix +++ b/pkgs/by-name/vu/vulkan-loader/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vulkan-loader"; - version = "1.3.296.0"; + version = "1.4.304.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Loader"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-6GHZUiYL3gDWN61SaLiD/3xXSoQb1rx6U5eu1cl8ZwM="; + hash = "sha256-qPknv8BvfJoewFfORXsFZlUnae36czHfOPXmtGccrOk="; }; patches = From 30d3ed43f63440639707037e00cf63bba61626a0 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 15 Jan 2025 10:56:50 +0300 Subject: [PATCH 04/12] vulkan-validation-layers: 1.3.296.0 -> 1.4.304.0 Diff: https://github.com/KhronosGroup/Vulkan-ValidationLayers/compare/vulkan-sdk-1.3.296.0...vulkan-sdk-1.4.304.0 --- pkgs/by-name/vu/vulkan-validation-layers/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vu/vulkan-validation-layers/package.nix b/pkgs/by-name/vu/vulkan-validation-layers/package.nix index 9aaebeb5b4ed5..d6b1127600913 100644 --- a/pkgs/by-name/vu/vulkan-validation-layers/package.nix +++ b/pkgs/by-name/vu/vulkan-validation-layers/package.nix @@ -25,13 +25,13 @@ let in stdenv.mkDerivation rec { pname = "vulkan-validation-layers"; - version = "1.3.296.0"; + version = "1.4.304.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ValidationLayers"; rev = "vulkan-sdk-${version}"; - hash = "sha256-H5AG+PXM3IdCfDqHMdaunRUWRm8QgdS6ZbZLMaOOALk="; + hash = "sha256-n7fbhi5NCQRsj/sAjLfaW6EBFBqGutN5Cnl/CtnnVPY="; }; strictDeps = true; From 8349591ac575799c044636b338a19d1bf7e70fff Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 15 Jan 2025 10:56:53 +0300 Subject: [PATCH 05/12] vulkan-tools: 1.3.296.0 -> 1.4.304.0 Diff: https://github.com/KhronosGroup/Vulkan-Tools/compare/vulkan-sdk-1.3.296.0...vulkan-sdk-1.4.304.0 --- pkgs/tools/graphics/vulkan-tools/default.nix | 8 +++++--- .../graphics/vulkan-tools/wayland-scanner.patch | 17 +++++++++++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 pkgs/tools/graphics/vulkan-tools/wayland-scanner.patch diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix index 435671c1915de..cc2370cfaa82b 100644 --- a/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -26,19 +26,22 @@ stdenv.mkDerivation rec { pname = "vulkan-tools"; - version = "1.3.296.0"; + version = "1.4.304.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Tools"; rev = "vulkan-sdk-${version}"; - hash = "sha256-+24IVmmcxuPaT/vYRYZ4yluHS/uKfWiVa7yIvzsdTuQ="; + hash = "sha256-PtxzLsywYwaL4vhbDiabryLaMUMcwJGcL14dt8dnzvs="; }; + patches = [ ./wayland-scanner.patch ]; + nativeBuildInputs = [ cmake pkg-config python3 + wayland-scanner ]; buildInputs = @@ -57,7 +60,6 @@ stdenv.mkDerivation rec { libXrandr wayland wayland-protocols - wayland-scanner ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ moltenvk diff --git a/pkgs/tools/graphics/vulkan-tools/wayland-scanner.patch b/pkgs/tools/graphics/vulkan-tools/wayland-scanner.patch new file mode 100644 index 0000000000000..cd5b56c10d047 --- /dev/null +++ b/pkgs/tools/graphics/vulkan-tools/wayland-scanner.patch @@ -0,0 +1,17 @@ +diff --git a/cube/CMakeLists.txt b/cube/CMakeLists.txt +index 4ecd3e36..17dc3f2e 100644 +--- a/cube/CMakeLists.txt ++++ b/cube/CMakeLists.txt +@@ -96,9 +96,9 @@ if (CMAKE_SYSTEM_NAME MATCHES "Linux|BSD|GNU") + pkg_get_variable(WAYLAND_SCANNER_EXECUTABLE wayland-scanner wayland_scanner) + message(DEBUG "WAYLAND_SCANNER_EXECUTABLE = ${WAYLAND_SCANNER_EXECUTABLE}") + +- pkg_get_variable(WAYLAND_CLIENT_PATH wayland-client pkgdatadir) +- message(DEBUG "WAYLAND_CLIENT_PATH = ${WAYLAND_CLIENT_PATH}") +- set(WAYLAND_CODE_PROTOCOL ${WAYLAND_CLIENT_PATH}/wayland.xml) ++ pkg_get_variable(WAYLAND_SCANNER_PATH wayland-scanner pkgdatadir) ++ message(DEBUG "WAYLAND_SCANNER_PATH = ${WAYLAND_SCANNER_PATH}") ++ set(WAYLAND_CODE_PROTOCOL ${WAYLAND_SCANNER_PATH}/wayland.xml) + + pkg_get_variable(WAYLAND_PROTOCOLS_PATH wayland-protocols pkgdatadir) + message(DEBUG "WAYLAND_PROTOCOLS_PATH = ${WAYLAND_PROTOCOLS_PATH}") From b93ab769f8518fec272643cd42bdf869a69c4299 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 15 Jan 2025 10:56:56 +0300 Subject: [PATCH 06/12] vulkan-tools-lunarg: 1.3.296.0 -> 1.4.304.0 Diff: https://github.com/LunarG/VulkanTools/compare/vulkan-sdk-1.3.296.0...vulkan-sdk-1.4.304.0 --- pkgs/by-name/vu/vulkan-tools-lunarg/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix b/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix index e8bac27836ebd..f36d96b07b778 100644 --- a/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix +++ b/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "vulkan-tools-lunarg"; - version = "1.3.296.0"; + version = "1.4.304.0"; src = fetchFromGitHub { owner = "LunarG"; repo = "VulkanTools"; rev = "vulkan-sdk-${version}"; - hash = "sha256-RaL7sqy5Rc8syPoM3SedZ6UilV9JUAA96JZh5/gIfPU="; + hash = "sha256-nudyg5YF2j4kv0fCx3vV/jGsYrEaTMf0xydvdHF6XCU="; }; nativeBuildInputs = [ From c556c6637504e4452fccdb595395dfcdc8bd1f67 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 15 Jan 2025 10:57:00 +0300 Subject: [PATCH 07/12] vulkan-extension-layer: 1.3.296.0 -> 1.4.304.0 Diff: https://github.com/KhronosGroup/Vulkan-ExtensionLayer/compare/vulkan-sdk-1.3.296.0...vulkan-sdk-1.4.304.0 --- pkgs/by-name/vu/vulkan-extension-layer/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vu/vulkan-extension-layer/package.nix b/pkgs/by-name/vu/vulkan-extension-layer/package.nix index 5abe48cbf00aa..2a65766295dd2 100644 --- a/pkgs/by-name/vu/vulkan-extension-layer/package.nix +++ b/pkgs/by-name/vu/vulkan-extension-layer/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "vulkan-extension-layer"; - version = "1.3.296.0"; + version = "1.4.304.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ExtensionLayer"; rev = "vulkan-sdk-${version}"; - hash = "sha256-pBpHYxJq36FrHsvpaMJvX0IKTvAh0R86qR7/vn6EBCw="; + hash = "sha256-HdRbnXb9/YghxRJEg7Xx2q+YyiLAUBZ7lm0ibxVpbdA="; }; nativeBuildInputs = [ From 5baf9d17f281fde6217b2be67e9c6dd77447a064 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 15 Jan 2025 10:57:03 +0300 Subject: [PATCH 08/12] vulkan-utility-libraries: 1.3.296.0 -> 1.4.304.0 Diff: https://github.com/KhronosGroup/Vulkan-Utility-Libraries/compare/vulkan-sdk-1.3.296.0...vulkan-sdk-1.4.304.0 --- pkgs/by-name/vu/vulkan-utility-libraries/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vu/vulkan-utility-libraries/package.nix b/pkgs/by-name/vu/vulkan-utility-libraries/package.nix index 6d966b41716c6..dc8643d0b3d60 100644 --- a/pkgs/by-name/vu/vulkan-utility-libraries/package.nix +++ b/pkgs/by-name/vu/vulkan-utility-libraries/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vulkan-utility-libraries"; - version = "1.3.296.0"; + version = "1.4.304.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Utility-Libraries"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-WDRDpUOZN/akUA6gsJMlC2GKolVt3g1NerKqe7aLhek="; + hash = "sha256-d20PRTCCNWezwhTD3axiQeWvY9lqD/8XLGBlOFgNzFE="; }; nativeBuildInputs = [ From dfff72fd969bc1cf9d2633da4c808119147e269d Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 15 Jan 2025 10:57:05 +0300 Subject: [PATCH 09/12] vulkan-volk: 1.3.296.0 -> 1.4.304.0 Diff: https://github.com/zeux/volk/compare/vulkan-sdk-1.3.296.0...vulkan-sdk-1.4.304.0 --- pkgs/by-name/vu/vulkan-volk/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vu/vulkan-volk/package.nix b/pkgs/by-name/vu/vulkan-volk/package.nix index 8e511707dd96a..71c1beabd4472 100644 --- a/pkgs/by-name/vu/vulkan-volk/package.nix +++ b/pkgs/by-name/vu/vulkan-volk/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "volk"; - version = "1.3.296.0"; + version = "1.4.304.0"; src = fetchFromGitHub { owner = "zeux"; repo = "volk"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-faLszfOeFo5eAzwvnrAUDVAPCVt/F9xRUFGxC9TA8E8="; + hash = "sha256-+SLGRvCUKFntz60/xL/NjoFjvvATWMImR4CGnCHUj2o="; }; nativeBuildInputs = [ cmake ]; From c28b09d3eb76e31a955c6f486403f692ba4f1f91 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 15 Jan 2025 10:57:08 +0300 Subject: [PATCH 10/12] spirv-headers: 1.3.296.0 -> 1.4.304.0 Diff: https://github.com/KhronosGroup/SPIRV-Headers/compare/vulkan-sdk-1.3.296.0...vulkan-sdk-1.4.304.0 --- pkgs/by-name/sp/spirv-headers/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sp/spirv-headers/package.nix b/pkgs/by-name/sp/spirv-headers/package.nix index f03f327f5a1b2..067e5fcb386a9 100644 --- a/pkgs/by-name/sp/spirv-headers/package.nix +++ b/pkgs/by-name/sp/spirv-headers/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "spirv-headers"; - version = "1.3.296.0"; + version = "1.4.304.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; rev = "vulkan-sdk-${version}"; - hash = "sha256-o1yRTvP7a+XVwendTKBJKNnelVGWLD0gH258GGeUDhQ="; + hash = "sha256-MCQ+i9ymjnxRZP/Agk7rOGdHcB4p67jT4J4athWUlcI="; }; nativeBuildInputs = [ cmake ]; From 863f9bc40631822ff8137830ac5c3878e4c8f5da Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 15 Jan 2025 10:57:19 +0300 Subject: [PATCH 11/12] spirv-cross: 1.3.296.0 -> 1.4.304.0 Diff: https://github.com/KhronosGroup/SPIRV-Cross/compare/vulkan-sdk-1.3.296.0...vulkan-sdk-1.4.304.0 Changelog: https://github.com/KhronosGroup/SPIRV-Cross/releases/tag/1.4.304.0 --- pkgs/by-name/sp/spirv-cross/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sp/spirv-cross/package.nix b/pkgs/by-name/sp/spirv-cross/package.nix index 1661cd71d8498..616d48c741776 100644 --- a/pkgs/by-name/sp/spirv-cross/package.nix +++ b/pkgs/by-name/sp/spirv-cross/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "spirv-cross"; - version = "1.3.296.0"; + version = "1.4.304.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Cross"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-HKEh/UQzDQEOvJGHQlM6kEYVZrMaUBOcOGjjHWXSPoo="; + hash = "sha256-cpWvGCXS6VaS0YehnGYTaXydL6S4FU9HLPh0JZ+jfd8="; }; nativeBuildInputs = [ From 872d8301e3ee5f16de91841b95073e7b8548bb3f Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 15 Jan 2025 10:57:22 +0300 Subject: [PATCH 12/12] spirv-tools: 1.3.296.0 -> 1.4.304.0 Diff: https://github.com/KhronosGroup/SPIRV-Tools/compare/vulkan-sdk-1.3.296.0...vulkan-sdk-1.4.304.0 --- pkgs/by-name/sp/spirv-tools/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sp/spirv-tools/package.nix b/pkgs/by-name/sp/spirv-tools/package.nix index cd7b3bdc82541..6ebbbb6cbb09c 100644 --- a/pkgs/by-name/sp/spirv-tools/package.nix +++ b/pkgs/by-name/sp/spirv-tools/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "spirv-tools"; - version = "1.3.296.0"; + version = "1.4.304.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; rev = "vulkan-sdk-${version}"; - hash = "sha256-ExseInoB/mMtVUOf0KMrQwDQ5UQdo3Ru7VnGMGPeXrk="; + hash = "sha256-alJ4X7qbTzsRTqRFdpjdsj0wERVb17czui2muEaKNyI="; }; # The cmake options are sufficient for turning on static building, but not