Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

Merge #311855: vulkan*: 1.3.280 -> 1.3.283

...into staging-next

+24 -24
+2 -2
pkgs/by-name/vu/vulkan-volk/package.nix
··· 2 3 stdenv.mkDerivation (finalAttrs: { 4 pname = "volk"; 5 - version = "1.3.280.0"; 6 7 src = fetchFromGitHub { 8 owner = "zeux"; 9 repo = "volk"; 10 rev = "vulkan-sdk-${finalAttrs.version}"; 11 - hash = "sha256-e4TLGRqn0taYeiRVxc9WevURjO5dsVq3RpOwZBGDknQ="; 12 }; 13 14 nativeBuildInputs = [ cmake ];
··· 2 3 stdenv.mkDerivation (finalAttrs: { 4 pname = "volk"; 5 + version = "1.3.283.0"; 6 7 src = fetchFromGitHub { 8 owner = "zeux"; 9 repo = "volk"; 10 rev = "vulkan-sdk-${finalAttrs.version}"; 11 + hash = "sha256-AoUStYeSTu6YmdyKgx0n3O+p3asb39GU6HSHgOhhFhQ="; 12 }; 13 14 nativeBuildInputs = [ cmake ];
+2 -2
pkgs/development/compilers/glslang/default.nix
··· 9 }: 10 stdenv.mkDerivation rec { 11 pname = "glslang"; 12 - version = "14.1.0"; 13 14 src = fetchFromGitHub { 15 owner = "KhronosGroup"; 16 repo = "glslang"; 17 rev = version; 18 - hash = "sha256-trm5bR3/2w+oQppHQBB+b6l0N0sLjTk5+rRGDfnGb+8="; 19 }; 20 21 # These get set at all-packages, keep onto them for child drvs
··· 9 }: 10 stdenv.mkDerivation rec { 11 pname = "glslang"; 12 + version = "14.2.0"; 13 14 src = fetchFromGitHub { 15 owner = "KhronosGroup"; 16 repo = "glslang"; 17 rev = version; 18 + hash = "sha256-B6jVCeoFjd2H6+7tIses+Kj8DgHS6E2dkVzQAIzDHEc="; 19 }; 20 21 # These get set at all-packages, keep onto them for child drvs
+2 -2
pkgs/development/libraries/spirv-headers/default.nix
··· 2 3 stdenv.mkDerivation rec { 4 pname = "spirv-headers"; 5 - version = "1.3.280.0"; 6 7 src = fetchFromGitHub { 8 owner = "KhronosGroup"; 9 repo = "SPIRV-Headers"; 10 rev = "vulkan-sdk-${version}"; 11 - hash = "sha256-kyOAwe4R0FmeA9IIJF2eoZR+7g9LiGKaZ7FuIfkrXJ4="; 12 }; 13 14 nativeBuildInputs = [ cmake ];
··· 2 3 stdenv.mkDerivation rec { 4 pname = "spirv-headers"; 5 + version = "1.3.283.0"; 6 7 src = fetchFromGitHub { 8 owner = "KhronosGroup"; 9 repo = "SPIRV-Headers"; 10 rev = "vulkan-sdk-${version}"; 11 + hash = "sha256-CAmDDqeMVKNdV/91VQYAKyCc+e+H99PRYZzt5WjswBI="; 12 }; 13 14 nativeBuildInputs = [ cmake ];
+2 -2
pkgs/development/libraries/vulkan-headers/default.nix
··· 1 { lib, stdenv, fetchFromGitHub, cmake }: 2 stdenv.mkDerivation rec { 3 pname = "vulkan-headers"; 4 - version = "1.3.280.0"; 5 6 nativeBuildInputs = [ cmake ]; 7 ··· 9 owner = "KhronosGroup"; 10 repo = "Vulkan-Headers"; 11 rev = "vulkan-sdk-${version}"; 12 - hash = "sha256-EnKiCtH6rh3ACQgokSSfp4FPFluMZW0dheP8IEzZtY4="; 13 }; 14 15 passthru.updateScript = ./update.sh;
··· 1 { lib, stdenv, fetchFromGitHub, cmake }: 2 stdenv.mkDerivation rec { 3 pname = "vulkan-headers"; 4 + version = "1.3.283.0"; 5 6 nativeBuildInputs = [ cmake ]; 7 ··· 9 owner = "KhronosGroup"; 10 repo = "Vulkan-Headers"; 11 rev = "vulkan-sdk-${version}"; 12 + hash = "sha256-DpbTYlEJPtyf/m9QEI8fdAm1Hw8MpFd+iCd7WB2gp/M="; 13 }; 14 15 passthru.updateScript = ./update.sh;
+2 -2
pkgs/development/libraries/vulkan-loader/default.nix
··· 4 5 stdenv.mkDerivation (finalAttrs: { 6 pname = "vulkan-loader"; 7 - version = "1.3.280.0"; 8 9 src = fetchFromGitHub { 10 owner = "KhronosGroup"; 11 repo = "Vulkan-Loader"; 12 rev = "vulkan-sdk-${finalAttrs.version}"; 13 - hash = "sha256-zkJSPshRaZRDiBvLJbJo8l1MX10KXYZniqtNTNnokT4="; 14 }; 15 16 patches = [ ./fix-pkgconfig.patch ];
··· 4 5 stdenv.mkDerivation (finalAttrs: { 6 pname = "vulkan-loader"; 7 + version = "1.3.283.0"; 8 9 src = fetchFromGitHub { 10 owner = "KhronosGroup"; 11 repo = "Vulkan-Loader"; 12 rev = "vulkan-sdk-${finalAttrs.version}"; 13 + hash = "sha256-pe4WYbfB20yRI5Pg+RxgmQcmdXsSoRxbBkQ3DdAL8r4="; 14 }; 15 16 patches = [ ./fix-pkgconfig.patch ];
+2 -2
pkgs/development/libraries/vulkan-utility-libraries/default.nix
··· 2 3 stdenv.mkDerivation (finalAttrs: { 4 pname = "vulkan-utility-libraries"; 5 - version = "1.3.280.0"; 6 7 src = fetchFromGitHub { 8 owner = "KhronosGroup"; 9 repo = "Vulkan-Utility-Libraries"; 10 rev = "vulkan-sdk-${finalAttrs.version}"; 11 - hash = "sha256-mCD9/bpWUXRVJ+OyOqG0tXTgFuptIlcG6UR/RiNV1Z0="; 12 }; 13 14 nativeBuildInputs = [ cmake python3 ];
··· 2 3 stdenv.mkDerivation (finalAttrs: { 4 pname = "vulkan-utility-libraries"; 5 + version = "1.3.283.0"; 6 7 src = fetchFromGitHub { 8 owner = "KhronosGroup"; 9 repo = "Vulkan-Utility-Libraries"; 10 rev = "vulkan-sdk-${finalAttrs.version}"; 11 + hash = "sha256-oQC//4RHJjSncQtHPVsYnpLYtXfxSSJdbUBf8clevDI="; 12 }; 13 14 nativeBuildInputs = [ cmake python3 ];
+2 -2
pkgs/development/tools/spirv-tools/default.nix
··· 2 3 stdenv.mkDerivation rec { 4 pname = "spirv-tools"; 5 - version = "1.3.280.0"; 6 7 src = fetchFromGitHub { 8 owner = "KhronosGroup"; 9 repo = "SPIRV-Tools"; 10 rev = "vulkan-sdk-${version}"; 11 - hash = "sha256-WnlFr9M7OI4unCIxfmSkvcLqZFKhW4Qkbb4+xp8lSOo="; 12 }; 13 14 # The cmake options are sufficient for turning on static building, but not
··· 2 3 stdenv.mkDerivation rec { 4 pname = "spirv-tools"; 5 + version = "1.3.283.0"; 6 7 src = fetchFromGitHub { 8 owner = "KhronosGroup"; 9 repo = "SPIRV-Tools"; 10 rev = "vulkan-sdk-${version}"; 11 + hash = "sha256-at3krE0torhjg7G+NkX0/ewc26Sg/1t2xW7wghAAuZo="; 12 }; 13 14 # The cmake options are sufficient for turning on static building, but not
+2 -2
pkgs/development/tools/vulkan-validation-layers/default.nix
··· 23 in 24 stdenv.mkDerivation rec { 25 pname = "vulkan-validation-layers"; 26 - version = "1.3.280.0"; 27 28 src = fetchFromGitHub { 29 owner = "KhronosGroup"; 30 repo = "Vulkan-ValidationLayers"; 31 rev = "vulkan-sdk-${version}"; 32 - hash = "sha256-jBiVbLRbAZEEU8ZYg9Ehx4b5hDJoi7+LnN++zKLSzvA="; 33 }; 34 35 nativeBuildInputs = [
··· 23 in 24 stdenv.mkDerivation rec { 25 pname = "vulkan-validation-layers"; 26 + version = "1.3.283.0"; 27 28 src = fetchFromGitHub { 29 owner = "KhronosGroup"; 30 repo = "Vulkan-ValidationLayers"; 31 rev = "vulkan-sdk-${version}"; 32 + hash = "sha256-OT9VfGg3+NBVV6SCGZ+Hu9FAxGJXXT45yvt2sHDIFTA="; 33 }; 34 35 nativeBuildInputs = [
+2 -2
pkgs/tools/graphics/spirv-cross/default.nix
··· 2 3 stdenv.mkDerivation (finalAttrs: { 4 pname = "spirv-cross"; 5 - version = "1.3.280.0"; 6 7 src = fetchFromGitHub { 8 owner = "KhronosGroup"; 9 repo = "SPIRV-Cross"; 10 rev = "vulkan-sdk-${finalAttrs.version}"; 11 - hash = "sha256-jWTTUHUvUyF5Vern3QXZo96Yvp7/T1WQjt3OpvJczsw="; 12 }; 13 14 nativeBuildInputs = [ cmake python3 ];
··· 2 3 stdenv.mkDerivation (finalAttrs: { 4 pname = "spirv-cross"; 5 + version = "1.3.283.0"; 6 7 src = fetchFromGitHub { 8 owner = "KhronosGroup"; 9 repo = "SPIRV-Cross"; 10 rev = "vulkan-sdk-${finalAttrs.version}"; 11 + hash = "sha256-UEXKzx1NXCInOnI96Z1hfrpyoWdb3BOGEKstX1gVzIo="; 12 }; 13 14 nativeBuildInputs = [ cmake python3 ];
+2 -2
pkgs/tools/graphics/vulkan-extension-layer/default.nix
··· 2 3 stdenv.mkDerivation rec { 4 pname = "vulkan-extension-layer"; 5 - version = "1.3.280.0"; 6 7 src = fetchFromGitHub { 8 owner = "KhronosGroup"; 9 repo = "Vulkan-ExtensionLayer"; 10 rev = "vulkan-sdk-${version}"; 11 - hash = "sha256-THy2/hZacOI6IUPFk8cckpBKM4W3pFFeeEwSTVoMDQo="; 12 }; 13 14 nativeBuildInputs = [ cmake pkg-config jq ];
··· 2 3 stdenv.mkDerivation rec { 4 pname = "vulkan-extension-layer"; 5 + version = "1.3.283.0"; 6 7 src = fetchFromGitHub { 8 owner = "KhronosGroup"; 9 repo = "Vulkan-ExtensionLayer"; 10 rev = "vulkan-sdk-${version}"; 11 + hash = "sha256-ClmCYJD9GRtM0XgbZqbW1OY1ukP8+FifneaXUjvNGQ4="; 12 }; 13 14 nativeBuildInputs = [ cmake pkg-config jq ];
+2 -2
pkgs/tools/graphics/vulkan-tools-lunarg/default.nix
··· 26 27 stdenv.mkDerivation rec { 28 pname = "vulkan-tools-lunarg"; 29 - version = "1.3.280.0"; 30 31 src = fetchFromGitHub { 32 owner = "LunarG"; 33 repo = "VulkanTools"; 34 rev = "vulkan-sdk-${version}"; 35 - hash = "sha256-tp5b7/1lDF9oe/AsiqhVCvYY8p9UguGAgIkLS/hIhfQ="; 36 }; 37 38 nativeBuildInputs = [ cmake python3 jq which pkg-config libsForQt5.qt5.wrapQtAppsHook ];
··· 26 27 stdenv.mkDerivation rec { 28 pname = "vulkan-tools-lunarg"; 29 + version = "1.3.283.0"; 30 31 src = fetchFromGitHub { 32 owner = "LunarG"; 33 repo = "VulkanTools"; 34 rev = "vulkan-sdk-${version}"; 35 + hash = "sha256-kRioHGrk6zsBIsnvusq6usAQqxQmCMmGk+O3ckkGEG4="; 36 }; 37 38 nativeBuildInputs = [ cmake python3 jq which pkg-config libsForQt5.qt5.wrapQtAppsHook ];
+2 -2
pkgs/tools/graphics/vulkan-tools/default.nix
··· 24 25 stdenv.mkDerivation rec { 26 pname = "vulkan-tools"; 27 - version = "1.3.280.0"; 28 29 src = fetchFromGitHub { 30 owner = "KhronosGroup"; 31 repo = "Vulkan-Tools"; 32 rev = "vulkan-sdk-${version}"; 33 - hash = "sha256-v6Piz1nvNffopz5FVRkgJ1pXj63jCWTyNopkpjcBFXA="; 34 }; 35 36 nativeBuildInputs = [
··· 24 25 stdenv.mkDerivation rec { 26 pname = "vulkan-tools"; 27 + version = "1.3.283.0"; 28 29 src = fetchFromGitHub { 30 owner = "KhronosGroup"; 31 repo = "Vulkan-Tools"; 32 rev = "vulkan-sdk-${version}"; 33 + hash = "sha256-IAlqFCenv5e70XyLSYh2fE84JZQFJwg+YKTGaK7ShKA="; 34 }; 35 36 nativeBuildInputs = [