From 0a5933400ea215833ef7e2564610b42e21ebfeb6 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 17 Jan 2024 20:40:06 +0300 Subject: [PATCH 01/12] vulkan-volk: init at 1.3.275.0 --- .../libraries/vulkan-headers/update.sh | 1 + .../libraries/vulkan-volk/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 28 insertions(+) create mode 100644 pkgs/development/libraries/vulkan-volk/default.nix diff --git a/pkgs/development/libraries/vulkan-headers/update.sh b/pkgs/development/libraries/vulkan-headers/update.sh index da4e42ded84a2..dd3fac2ee4dd1 100755 --- a/pkgs/development/libraries/vulkan-headers/update.sh +++ b/pkgs/development/libraries/vulkan-headers/update.sh @@ -11,6 +11,7 @@ SDK_PACKAGES=( "vulkan-tools-lunarg" "vulkan-extension-layer" "vulkan-utility-libraries" + "vulkan-volk" "spirv-headers" "spirv-cross" "spirv-tools" diff --git a/pkgs/development/libraries/vulkan-volk/default.nix b/pkgs/development/libraries/vulkan-volk/default.nix new file mode 100644 index 0000000000000..1164fd2921e2a --- /dev/null +++ b/pkgs/development/libraries/vulkan-volk/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchFromGitHub, cmake, vulkan-headers }: + +stdenv.mkDerivation (finalAttrs: { + pname = "volk"; + version = "1.3.275.0"; + + src = fetchFromGitHub { + owner = "zeux"; + repo = "volk"; + rev = "vulkan-sdk-${finalAttrs.version}"; + hash = "sha256-uTjLgJMGN8nOVhVIl/GNhO2jXe9ebhc9vzAwCDwfuf4="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ vulkan-headers ]; + + cmakeFlags = ["-DVOLK_INSTALL=1"]; + + meta = with lib; { + description = " Meta loader for Vulkan API"; + homepage = "https://github.com/zeux/volk"; + platforms = platforms.all; + license = licenses.mit; + maintainers = with maintainers; [ k900 ]; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 13561c4ebe2a2..c639a09f59645 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25529,6 +25529,7 @@ with pkgs; vulkan-tools-lunarg = callPackage ../tools/graphics/vulkan-tools-lunarg { }; vulkan-utility-libraries = callPackage ../development/libraries/vulkan-utility-libraries { }; vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers { }; + vulkan-volk = callPackage ../development/libraries/vulkan-volk { }; vxl = callPackage ../development/libraries/vxl { }; From 2a8f51face14173e235e097dfcc597825fc47218 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 17 Jan 2024 20:15:15 +0300 Subject: [PATCH 02/12] glslang: 13.1.1 -> 14.0.0 Diff: https://github.com/KhronosGroup/glslang/compare/13.1.1...14.0.0 --- pkgs/development/compilers/glslang/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix index ff55201ebd03f..5387eb15b713b 100644 --- a/pkgs/development/compilers/glslang/default.nix +++ b/pkgs/development/compilers/glslang/default.nix @@ -9,13 +9,13 @@ }: stdenv.mkDerivation rec { pname = "glslang"; - version = "13.1.1"; + version = "14.0.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; rev = version; - hash = "sha256-fuzNsVYdnThMzd4tLN/sTbCBXg6qXKLDJRziOKyOBGg="; + hash = "sha256-7kIIU45pe+IF7lGltpIKSvQBmcXR+TWFvmx7ztMNrpc="; }; # These get set at all-packages, keep onto them for child drvs From 0dec9ac7772bb700af880f978c861bb967aa45f7 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 17 Jan 2024 20:15:19 +0300 Subject: [PATCH 03/12] vulkan-headers: 1.3.268.0 -> 1.3.275.0 Diff: https://github.com/KhronosGroup/Vulkan-Headers/compare/vulkan-sdk-1.3.268.0...vulkan-sdk-1.3.275.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 f6c9dcb953e39..dc17404c84802 100644 --- a/pkgs/development/libraries/vulkan-headers/default.nix +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "vulkan-headers"; - version = "1.3.268.0"; + version = "1.3.275.0"; nativeBuildInputs = [ cmake ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-Headers"; rev = "vulkan-sdk-${version}"; - hash = "sha256-CDjWTXXnUgj9QaLDNuSVy+wf8If5LehwOZ0t0Fuh2Ro="; + hash = "sha256-kBOkj7mr4stPXUCBhNJpNL3A+9BebEwrIBEIroxdH8Y="; }; passthru.updateScript = ./update.sh; From ca785c26a93a5f071de28dfc74cac7c58b55d9f4 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 17 Jan 2024 20:15:23 +0300 Subject: [PATCH 04/12] vulkan-loader: 1.3.268.0 -> 1.3.275.0 Diff: https://github.com/KhronosGroup/Vulkan-Loader/compare/vulkan-sdk-1.3.268.0...vulkan-sdk-1.3.275.0 --- pkgs/development/libraries/vulkan-loader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 068c1d3d2c2a8..958cc2dadc7ba 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "vulkan-loader"; - version = "1.3.268.0"; + version = "1.3.275.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Loader"; rev = "vulkan-sdk-${version}"; - hash = "sha256-TDn8eVz1fhGfvUiGcxqOk2BN9tuIF5+ssIXtOo3weS0="; + hash = "sha256-53PUXAWiK38ciV6oMvD7ZHdXi4RU4r0RmDWUUHU3mE0="; }; patches = [ ./fix-pkgconfig.patch ]; From 7e0afaf597cdee90539014fdd27b7e4ac207fd4f Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 17 Jan 2024 20:15:29 +0300 Subject: [PATCH 05/12] vulkan-validation-layers: 1.3.268.0 -> 1.3.275.0 Diff: https://github.com/KhronosGroup/Vulkan-ValidationLayers/compare/vulkan-sdk-1.3.268.0...vulkan-sdk-1.3.275.0 --- 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 09a11cef84f4e..1d0a39fb2b8bd 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -23,13 +23,13 @@ let in stdenv.mkDerivation rec { pname = "vulkan-validation-layers"; - version = "1.3.268.0"; + version = "1.3.275.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ValidationLayers"; rev = "vulkan-sdk-${version}"; - hash = "sha256-DwkSUclStYKe54tC1H3jMv1KOSScgqf25tR5ajQZ6os="; + hash = "sha256-hJx8gn0zCN3+DhO6niylZJXPHgQ+VhQV5tL8qAeRaUg="; }; nativeBuildInputs = [ From 9346cae320191f052632f55f3fbdad965fa0c776 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 17 Jan 2024 20:15:33 +0300 Subject: [PATCH 06/12] vulkan-tools: 1.3.268.0 -> 1.3.275.0 Diff: https://github.com/KhronosGroup/Vulkan-Tools/compare/vulkan-sdk-1.3.268.0...vulkan-sdk-1.3.275.0 --- pkgs/tools/graphics/vulkan-tools/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix index d590ac7d340c6..087326f71322a 100644 --- a/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -14,6 +14,7 @@ , libXrandr , vulkan-headers , vulkan-loader +, vulkan-volk , wayland , wayland-protocols , moltenvk @@ -23,13 +24,13 @@ stdenv.mkDerivation rec { pname = "vulkan-tools"; - version = "1.3.268.0"; + version = "1.3.275.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Tools"; rev = "vulkan-sdk-${version}"; - hash = "sha256-IsMxiAR4ak6kC3BNYhtI+JVNkEka4ZceSElxk39THXg="; + hash = "sha256-0sAwO8gXzpMst+7l7LS1oiDLo9E6otDktCti+v8jwDw="; }; nativeBuildInputs = [ @@ -42,6 +43,7 @@ stdenv.mkDerivation rec { glslang vulkan-headers vulkan-loader + vulkan-volk ] ++ lib.optionals (!stdenv.isDarwin) [ libffi libX11 From 0afd1dcf3e3ac1903d87634d80dc55f7b5f3de0c Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 17 Jan 2024 20:15:55 +0300 Subject: [PATCH 07/12] vulkan-tools-lunarg: 1.3.268.0 -> 1.3.275.0 Diff: https://github.com/LunarG/VulkanTools/compare/vulkan-sdk-1.3.268.0...vulkan-sdk-1.3.275.0 --- pkgs/tools/graphics/vulkan-tools-lunarg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix index 0db3cf1597713..778b136558869 100644 --- a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix +++ b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "vulkan-tools-lunarg"; - version = "1.3.268.0"; + version = "1.3.275.0"; src = fetchFromGitHub { owner = "LunarG"; repo = "VulkanTools"; rev = "vulkan-sdk-${version}"; - hash = "sha256-2ZUD+RBsl35QV3250JOPCIoJb4sJcBsiRE4SZaS6ROs="; + hash = "sha256-MEQX90HL90jyVBWWcvOF7QLzm1+fNE5TW3MWdK4w53M="; }; nativeBuildInputs = [ cmake python3 jq which pkg-config libsForQt5.qt5.wrapQtAppsHook ]; From 5cb62285ca985e346740d7e5f2982d13b650a919 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 17 Jan 2024 20:16:00 +0300 Subject: [PATCH 08/12] vulkan-extension-layer: 1.3.268.0 -> 1.3.275.0 Diff: https://github.com/KhronosGroup/Vulkan-ExtensionLayer/compare/vulkan-sdk-1.3.268.0...vulkan-sdk-1.3.275.0 --- pkgs/tools/graphics/vulkan-extension-layer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/vulkan-extension-layer/default.nix b/pkgs/tools/graphics/vulkan-extension-layer/default.nix index dae55225a0b3f..336c31811aa21 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.268.0"; + version = "1.3.275.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ExtensionLayer"; rev = "vulkan-sdk-${version}"; - hash = "sha256-rSKPTeTDOz6IeJGRt9aIu1VH8VfVzXNYZfjdiSXEJxg="; + hash = "sha256-zQycF3yKoa54KBUIuG1BqFGB00yc6oZQzdcDel2rXN0="; }; nativeBuildInputs = [ cmake pkg-config jq ]; From 8023641f15d1f1f739ffdfb7fa8fb66083ba628a Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 17 Jan 2024 20:18:21 +0300 Subject: [PATCH 09/12] vulkan-utility-libraries: 1.3.268 -> 1.3.275.0 Diff: https://github.com/KhronosGroup/Vulkan-Utility-Libraries/compare/vulkan-sdk-1.3.268...vulkan-sdk-1.3.275.0 --- .../libraries/vulkan-utility-libraries/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/vulkan-utility-libraries/default.nix b/pkgs/development/libraries/vulkan-utility-libraries/default.nix index 41d1854692fd9..301311e124128 100644 --- a/pkgs/development/libraries/vulkan-utility-libraries/default.nix +++ b/pkgs/development/libraries/vulkan-utility-libraries/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vulkan-utility-libraries"; - version = "1.3.268"; + version = "1.3.275.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Utility-Libraries"; - rev = "v${finalAttrs.version}"; - hash = "sha256-l6PiHCre/JQg8PSs1k/0Zzfwwv55AqVdZtBbjeKLS6E="; + rev = "vulkan-sdk-${finalAttrs.version}"; + hash = "sha256-gvia+Xb9BpOjPARKo3Sgp85Bfh1roFZ2PzCtXVFYeIU="; }; nativeBuildInputs = [ cmake python3 ]; From b52d8522e53dd887e438f4d11bab610b0fbbc597 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 17 Jan 2024 20:18:24 +0300 Subject: [PATCH 10/12] spirv-headers: 1.3.268.0 -> 1.3.275.0 Diff: https://github.com/KhronosGroup/SPIRV-Headers/compare/vulkan-sdk-1.3.268.0...vulkan-sdk-1.3.275.0 --- pkgs/development/libraries/spirv-headers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/spirv-headers/default.nix b/pkgs/development/libraries/spirv-headers/default.nix index 3e18424d6b74e..64362243229b2 100644 --- a/pkgs/development/libraries/spirv-headers/default.nix +++ b/pkgs/development/libraries/spirv-headers/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spirv-headers"; - version = "1.3.268.0"; + version = "1.3.275.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; rev = "vulkan-sdk-${version}"; - hash = "sha256-uOnSTih14bUPtrJgp7vVb3/UfdKsF6jFQqjlFeJ81AI="; + hash = "sha256-/I9dJlBE0kvFvqooKuqMETtOE72Jmva3zIGnq0o4+aE="; }; nativeBuildInputs = [ cmake ]; From 77037208859cbf320db3c72663d52695fe68c4c0 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 17 Jan 2024 20:18:30 +0300 Subject: [PATCH 11/12] spirv-cross: 1.3.268.0 -> 1.3.275.0 Diff: https://github.com/KhronosGroup/SPIRV-Cross/compare/vulkan-sdk-1.3.268.0...vulkan-sdk-1.3.275.0 Changelog: https://github.com/KhronosGroup/SPIRV-Cross/releases/tag/24.05pre-git --- pkgs/tools/graphics/spirv-cross/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/spirv-cross/default.nix b/pkgs/tools/graphics/spirv-cross/default.nix index cd7489be9aec7..73413c1aee4c1 100644 --- a/pkgs/tools/graphics/spirv-cross/default.nix +++ b/pkgs/tools/graphics/spirv-cross/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "spirv-cross"; - version = "1.3.268.0"; + version = "1.3.275.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Cross"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-UIk5hihUPjXNzEeO2laS4dUef/rEExxXAZjMcftx+3A="; + hash = "sha256-Mhr3Yxm5MeLLQFmxWmtXLsq+ZcOE+KMs+3iiTYF8t30="; }; nativeBuildInputs = [ cmake python3 ]; From 3eb5040f0c7cfbdde36c04b3f807464e584f9967 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 17 Jan 2024 20:18:35 +0300 Subject: [PATCH 12/12] spirv-tools: 1.3.268.0 -> 1.3.275.0 Diff: https://github.com/KhronosGroup/SPIRV-Tools/compare/vulkan-sdk-1.3.268.0...vulkan-sdk-1.3.275.0 --- pkgs/development/tools/spirv-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix index 8827d6b709e7b..648b2615166c1 100644 --- a/pkgs/development/tools/spirv-tools/default.nix +++ b/pkgs/development/tools/spirv-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spirv-tools"; - version = "1.3.268.0"; + version = "1.3.275.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; rev = "vulkan-sdk-${version}"; - hash = "sha256-Bned5Pa6zCFByfNvqD0M5t3l4uAJYkDlpe6wu8e7a3U="; + hash = "sha256-RzGvoDt1Qc+f6mZsfs99MxX4YB3yFc5FP92Yx/WGrsI="; }; # The cmake options are sufficient for turning on static building, but not