lol

Merge pull request #197775 from PedroHLC/vulkan-1.3.231.0

authored by

Bernardo Meurer and committed by
GitHub
5fe5f94a abfd2fe8

+24 -19
+2 -2
pkgs/development/compilers/glslang/default.nix
··· 9 9 }: 10 10 stdenv.mkDerivation rec { 11 11 pname = "glslang"; 12 - version = "1.3.224.1"; 12 + version = "1.3.231.0"; 13 13 14 14 src = fetchFromGitHub { 15 15 owner = "KhronosGroup"; 16 16 repo = "glslang"; 17 17 rev = "sdk-${version}"; 18 - hash = "sha256-VEOENuy/VhYBBX52O4QHJFXUjsj6jL4vDD4cLDlQcIA="; 18 + hash = "sha256-huPrQr+lPi7QCF8CufAavHEKGDDimGrcskiojhH9QYk="; 19 19 }; 20 20 21 21 # These get set at all-packages, keep onto them for child drvs
+2 -2
pkgs/development/libraries/spirv-headers/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "spirv-headers"; 5 - version = "1.3.224.1"; 5 + version = "1.3.231.0"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "KhronosGroup"; 9 9 repo = "SPIRV-Headers"; 10 10 rev = "sdk-${version}"; 11 - hash = "sha256-qYhFoRrQOlvYvVXhIFsa3dZuORDpZyVC5peeYmGNimw="; 11 + hash = "sha256-lUWgZYGPu+IaLUrbtyC7R0o3Hq/q7C7BE8r7DAsiC30="; 12 12 }; 13 13 14 14 nativeBuildInputs = [ cmake ];
+2 -2
pkgs/development/libraries/vulkan-headers/default.nix
··· 1 1 { lib, stdenv, fetchFromGitHub, cmake }: 2 2 stdenv.mkDerivation rec { 3 3 pname = "vulkan-headers"; 4 - version = "1.3.224.1"; 4 + version = "1.3.231.0"; 5 5 6 6 nativeBuildInputs = [ cmake ]; 7 7 ··· 9 9 owner = "KhronosGroup"; 10 10 repo = "Vulkan-Headers"; 11 11 rev = "sdk-${version}"; 12 - hash = "sha256-zUT5+Ttmkrj51a9FS1tQxoYMS0Y0xV8uaCEJNur4khc="; 12 + hash = "sha256-EoD48jBoJmIet4BDC6bYxOsKK2358SZ/NcZeM61q/5g="; 13 13 }; 14 14 15 15 meta = with lib; {
+2 -2
pkgs/development/libraries/vulkan-loader/default.nix
··· 3 3 4 4 stdenv.mkDerivation rec { 5 5 pname = "vulkan-loader"; 6 - version = "1.3.224.1"; 6 + version = "1.3.231.0"; 7 7 8 8 src = (assert version == vulkan-headers.version; 9 9 fetchFromGitHub { 10 10 owner = "KhronosGroup"; 11 11 repo = "Vulkan-Loader"; 12 12 rev = "sdk-${version}"; 13 - hash = "sha256-lmdImPeosHbAbEzPVW4K9Wkz/mF6gr8MVroGf0bDEPc="; 13 + hash = "sha256-HWaa3JT0znhvqbvZdcsAwy8Dr6HDQp4rgpVmMOuCo0s="; 14 14 }); 15 15 16 16 patches = [ ./fix-pkgconfig.patch ];
+2 -2
pkgs/development/tools/spirv-tools/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "spirv-tools"; 5 - version = "1.3.224.1"; 5 + version = "1.3.231.0"; 6 6 7 7 src = (assert version == spirv-headers.version; 8 8 fetchFromGitHub { 9 9 owner = "KhronosGroup"; 10 10 repo = "SPIRV-Tools"; 11 11 rev = "sdk-${version}"; 12 - hash = "sha256-jpVvjrNrTAKUY4sjUT/gCUElLtW4BrznH1DbStojGB8="; 12 + hash = "sha256-sqjQoz9v9alSPc0ujEcWZxDAWh2S6oAPP1+JZmNCpA0="; 13 13 } 14 14 ); 15 15
+2 -2
pkgs/development/tools/vulkan-validation-layers/default.nix
··· 22 22 in 23 23 stdenv.mkDerivation rec { 24 24 pname = "vulkan-validation-layers"; 25 - version = "1.3.224.1"; 25 + version = "1.3.231.0"; 26 26 27 27 # If we were to use "dev" here instead of headers, the setupHook would be 28 28 # placed in that output instead of "out". ··· 34 34 owner = "KhronosGroup"; 35 35 repo = "Vulkan-ValidationLayers"; 36 36 rev = "sdk-${version}"; 37 - hash = "sha256-5To5Llxl1i1XLaU2tR/O7g7dn2iV3FwLH7gFdXTMXxo="; 37 + hash = "sha256-5bzUauu8081zyRaWmRUtOxHjUU4gc1GWoJtU783Msh0="; 38 38 }); 39 39 40 40 # Include absolute paths to layer libraries in their associated
+7 -2
pkgs/tools/graphics/vulkan-extension-layer/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "vulkan-extension-layer"; 5 - version = "1.3.224.1"; 5 + version = "1.3.231.0"; 6 6 7 7 src = (assert version == vulkan-headers.version; 8 8 fetchFromGitHub { 9 9 owner = "KhronosGroup"; 10 10 repo = "Vulkan-ExtensionLayer"; 11 11 rev = "sdk-${version}"; 12 - hash = "sha256-KOlwtfuAYWzUFtf0NOJCNzWW+/ogRUgkaWw8NdW2vb8="; 12 + hash = "sha256-8Z9w+3WFPYp8QKEUVkEQCGy9LXMWYlZDgGt8i34T5DU="; 13 13 }); 14 14 15 15 nativeBuildInputs = [ cmake jq ]; ··· 20 20 setupHook = writeText "setup-hook" '' 21 21 export XDG_DATA_DIRS=@out@/share:$XDG_DATA_DIRS 22 22 ''; 23 + 24 + # Tests are not for gpu-less and headless environments 25 + cmakeFlags = [ 26 + "-DBUILD_TESTS=false" 27 + ]; 23 28 24 29 # Include absolute paths to layer libraries in their associated 25 30 # layer definition json files.
+2 -2
pkgs/tools/graphics/vulkan-tools-lunarg/default.nix
··· 23 23 stdenv.mkDerivation rec { 24 24 pname = "vulkan-tools-lunarg"; 25 25 # The version must match that in vulkan-headers 26 - version = "1.3.224.1"; 26 + version = "1.3.231.0"; 27 27 28 28 src = (assert version == vulkan-headers.version; 29 29 fetchFromGitHub { 30 30 owner = "LunarG"; 31 31 repo = "VulkanTools"; 32 32 rev = "sdk-${version}"; 33 - hash = "sha256-YQv6YboyQJjLTEKspZQdV8YFhHux/4RIncHXOsz1cBw="; 33 + hash = "sha256-qomhouuKVv4Dat9Sv7X68Dw6bRnaUjj6iEXC9pCqX4E="; 34 34 fetchSubmodules = true; 35 35 }); 36 36
+3 -3
pkgs/tools/graphics/vulkan-tools/default.nix
··· 21 21 22 22 stdenv.mkDerivation rec { 23 23 pname = "vulkan-tools"; 24 - version = "1.3.224.1"; 24 + version = "1.3.231.0"; 25 25 26 26 # It's not strictly necessary to have matching versions here, however 27 27 # since we're using the SDK version we may as well be consistent with 28 28 # the rest of nixpkgs. 29 - src = (assert version == vulkan-headers.version; 29 + src = (assert (version) == vulkan-headers.version; 30 30 fetchFromGitHub { 31 31 owner = "KhronosGroup"; 32 32 repo = "Vulkan-Tools"; 33 33 rev = "sdk-${version}"; 34 - hash = "sha256-Z+QJBd2LBdiJD1fHhBLbOfOoLhqTg0J3tq+XQRSiQaY="; 34 + hash = "sha256-6oimP4ISa0dX4bLU3Nch8Ur6MzEMQscnL8EfRrqT/Es="; 35 35 }); 36 36 37 37 nativeBuildInputs = [