ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-29 00:27:49 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #298129 from Flakebi/vulkan-cts2

Browse Source 
vulkan-cts: 1.3.7.3 -> 1.3.8.1
This commit is contained in:
Guillaume Girol 2024-03-30 22:01:55 +01:00 committed by GitHub
commit 9db82fb29e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/graphics/vulkan-cts/default.nix
View File

@ -39,13 +39,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "vulkan-cts";
version = "1.3.7.3";
version = "1.3.8.1";
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "VK-GL-CTS";
rev = "${finalAttrs.pname}-${finalAttrs.version}";
hash = "sha256-YtfUnrqWZwPMkLr3ovJz8Xr2ES1piW0yB+rBAaiQKoQ=";
hash = "sha256-lDMaJjAusK+Hva4BZnrXNmuGdSL04rh1W9PYsjxF3c8=";
};
prePatch = ''

34
pkgs/tools/graphics/vulkan-cts/sources.nix
View File

@ -1,25 +1,18 @@
# Autogenerated from vk-cts-sources.py
{ fetchurl, fetchFromGitHub }:
rec {
ESExtractor = fetchFromGitHub {
owner = "Igalia";
repo = "ESExtractor";
rev = "v0.3.3";
hash = "sha256-qqhDv08cLQlLaEj0qfghByK+IohdvQdI2ePfUNFEArQ=";
};
amber = fetchFromGitHub {
owner = "google";
repo = "amber";
rev = "933ecb4d6288675a92eb1650e0f52b1d7afe8273";
hash = "sha256-v9z4gv/mTjaCkByZn6uDpMteQuIf0FzZXeKyoXfFjXo=";
rev = "8e90b2d2f532bcd4a80069e3f37a9698209a21bc";
hash = "sha256-LuNCND/NXoNbbTWv7RYQUkq2QXL1qXR27uHwFIz0DXg=";
};
glslang = fetchFromGitHub {
owner = "KhronosGroup";
repo = "glslang";
rev = "c5117b328afc86e16edff6ed6afe0fe7872a7cf3";
hash = "sha256-4SoET76fCfutttK00JGCKVQUn0ivGdTw6GhndvxbIDU=";
rev = "9fd0fcd737f1369e89fb3aa8b2e62bad57ac46c6";
hash = "sha256-A3IFW3kOuOGj4AfpdDfAHIySDLdIB9IK+wk8TSBcPrk=";
};
jsoncpp = fetchFromGitHub {
@ -32,36 +25,35 @@ rec {
nvidia-video-samples = fetchFromGitHub {
owner = "Igalia";
repo = "vk_video_samples";
rev = "138bbe048221d315962ddf8413aa6a08cc62a381";
hash = "sha256-ftHhb5u3l7WbgEu6hHynBnvNbVOn5TFne915M17jiAQ=";
rev = "ce80453dadeea7b1a6409434f3358ef1e46e4ae7";
hash = "sha256-zgHMaUA7rdLbmkX8lr4p2TW9g1RDyBmUs5rK++wmUjE=";
};
spirv-headers = fetchFromGitHub {
owner = "KhronosGroup";
repo = "SPIRV-Headers";
rev = "b8b9eb8640c8c0107ba580fbcb10f969022ca32c";
hash = "sha256-gcKwML5ItccAhX+QtR9G86h0JnaiVQEmOQzQpL005dg=";
rev = "d3c2a6fa95ad463ca8044d7fc45557db381a6a64";
hash = "sha256-POd/TnbVzq/Xyi0O4hU24Qk4LDD5Af2kHJgQ+wPVDsg=";
};
spirv-tools = fetchFromGitHub {
owner = "KhronosGroup";
repo = "SPIRV-Tools";
rev = "bfc94f63a7adbcf8ae166f5f108ac9f69079efc0";
hash = "sha256-gju6hJSIWOswGnRxKeJZsU1jgp3HSZAf7wFRxswY+Js=";
rev = "f9184c6501f7e349e0664d281ac93b1db9c1e5ad";
hash = "sha256-BDnKOUIWZVGPPwmQsMqF1yWy80dl75kdaoztUMnlrqc=";
};
vulkan-docs = fetchFromGitHub {
owner = "KhronosGroup";
repo = "Vulkan-Docs";
rev = "b9aad705f0d9e5e6734ac2ad671d5d1de57b05e0";
hash = "sha256-bJ2C1+zjvLiYp5A5AHTevFPU9Yka99imqLwH+uApuoY=";
rev = "d99193d3fcc4b2a0dacc0a9d7e4951ea611a3e96";
hash = "sha256-pfPErjZ4jSxEg+OgFcELyvqrS0Hm3QWQ3WhQ9T3rJbQ=";
};
prePatch = ''
mkdir -p external/ESExtractor external/amber external/glslang external/jsoncpp external/nvidia-video-samples external/spirv-headers external/spirv-tools external/vulkan-docs
mkdir -p external/amber external/glslang external/jsoncpp external/nvidia-video-samples external/spirv-headers external/spirv-tools external/vulkan-docs
cp -r ${ESExtractor} external/ESExtractor/src
cp -r ${amber} external/amber/src
cp -r ${glslang} external/glslang/src
cp -r ${jsoncpp} external/jsoncpp/src

2
pkgs/tools/graphics/vulkan-cts/update.sh
View File

@ -3,7 +3,7 @@
set -euo pipefail
rawVersion="$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s "https://api.github.com/repos/KhronosGroup/VK-GL-CTS/releases" | jq -r 'map(select(.tag_name | startswith("vulkan-cts-"))) | .[0].tag_name')"
rawVersion="$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -s "https://api.github.com/repos/KhronosGroup/VK-GL-CTS/releases" | jq -r 'map(select(.tag_name | startswith("vulkan-cts-"))) | .[0].tag_name')"
basedir="$(git rev-parse --show-toplevel)"
cd "$basedir"