push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,153 @@
{
lib,
stdenv,
fetchFromGitHub,
fetchurl,
runCommand,
cmake,
ffmpeg,
glslang,
libdrm,
libglvnd,
libffi,
libpng,
libX11,
libXau,
libXdmcp,
libxcb,
makeWrapper,
mesa,
ninja,
pkg-config,
python3,
spirv-headers,
vulkan-headers,
vulkan-loader,
vulkan-utility-libraries,
wayland,
wayland-protocols,
wayland-scanner,
zlib,
}:
let
renderdoc = fetchurl {
url = "https://raw.githubusercontent.com/baldurk/renderdoc/v1.1/renderdoc/api/app/renderdoc_app.h";
hash = "sha256-57XwqlsbDq3GOhxiTAyn9a8TOqhX1qQnGw7z0L22ho4=";
};
# The build system expects all these dependencies inside the external folder and
# does not search for system-wide installations.
# It also expects the version specified in the repository, which can be incompatible
# with the version in nixpkgs (e.g. for SPIRV-Headers), so we don't want to patch in our packages.
# The revisions are extracted from https://github.com/KhronosGroup/VK-GL-CTS/blob/main/external/fetch_sources.py#L290
# with the vk-cts-sources.py script.
sources = import ./sources.nix { inherit fetchurl fetchFromGitHub; };
in
stdenv.mkDerivation (finalAttrs: {
pname = "vulkan-cts";
version = "1.4.3.3";
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "VK-GL-CTS";
rev = "vulkan-cts-${finalAttrs.version}";
hash = "sha256-bhbk2ayY4syyUXJcYesRlVFArAVhivTjELvM8uuNzEQ=";
};
prePatch = ''
mkdir -p external/renderdoc/src
cp -r ${renderdoc} external/renderdoc/src/renderdoc_app.h
${sources.prePatch}
substituteInPlace external/vulkan-validationlayers/CMakeLists.txt \
--replace-fail 'UPDATE_DEPS ON' 'UPDATE_DEPS OFF'
substituteInPlace external/vulkan-video-samples/src/cmake/FindVulkanSDK.cmake \
--replace-fail 'GIT_TAG main' 'GIT_TAG main FIND_PACKAGE_ARGS NAMES VulkanHeaders'
chmod u+w -R external
'';
buildInputs = [
ffmpeg
libdrm
libffi
libglvnd
libpng
libX11
libXau
libXdmcp
libxcb
vulkan-headers
vulkan-utility-libraries
wayland
wayland-protocols
zlib
];
nativeBuildInputs = [
cmake
makeWrapper
ninja
pkg-config
python3
wayland-scanner
];
depsBuildBuild = [
pkg-config
];
cmakeFlags = [
# Fix cts cmake not coping with absolute install dirs
"-DCMAKE_INSTALL_BINDIR=bin"
"-DCMAKE_INSTALL_LIBDIR=lib"
"-DCMAKE_INSTALL_INCLUDEDIR=include"
"-DWAYLAND_SCANNER=wayland-scanner"
# For vulkan-validation-layers
"-DGLSLANG_INSTALL_DIR=${glslang}"
"-DSPIRV_HEADERS_INSTALL_DIR=${spirv-headers}"
"-DSELECTED_BUILD_TARGETS=deqp-vk"
];
postInstall = ''
# Check that nothing was installed so far
! test -e $out
mkdir -p $out/bin $out/archive-dir
cp -a external/vulkancts/modules/vulkan/deqp-vk $out/bin/
cp -a external/vulkancts/modules/vulkan/vulkan $out/archive-dir/
cp -a external/vulkancts/modules/vulkan/vk-default $out/
'';
postFixup = ''
patchelf --add-rpath "${vulkan-loader}/lib" --add-needed "libvulkan.so" $out/bin/deqp-vk
wrapProgram $out/bin/deqp-vk \
--add-flags "--deqp-archive-dir=$out/archive-dir"
'';
passthru.updateScript = ./update.sh;
passthru.tests.lavapipe =
runCommand "vulkan-cts-tests-lavapipe"
{
nativeBuildInputs = [
finalAttrs.finalPackage
mesa.llvmpipeHook
];
}
''
deqp-vk -n dEQP-VK.api.smoke.triangle
touch $out
'';
meta = with lib; {
description = "Khronos Vulkan Conformance Tests";
homepage = "https://github.com/KhronosGroup/VK-GL-CTS/blob/main/external/vulkancts/README.md";
changelog = "https://github.com/KhronosGroup/VK-GL-CTS/releases/tag/vulkan-cts-${finalAttrs.version}";
license = licenses.asl20;
maintainers = with maintainers; [ Flakebi ];
};
})

View File

@@ -0,0 +1,88 @@
# Autogenerated from vk-cts-sources.py
{ fetchurl, fetchFromGitHub }:
rec {
amber = fetchFromGitHub {
owner = "google";
repo = "amber";
rev = "57ba1ca211b6f4890c013dcf42cb16069ae916dd";
hash = "sha256-mV9Eb+4rWDLAYCwyhAY42uuc8WqWwoOvT/Q8ov/2ISA=";
};
glslang = fetchFromGitHub {
owner = "KhronosGroup";
repo = "glslang";
rev = "963588074b26326ff0426c8953c1235213309bdb";
hash = "sha256-HLmTUILBohdM99H8UTyuzo1rTVKONkfCpniVWcvE2W8=";
};
jsoncpp = fetchFromGitHub {
owner = "open-source-parsers";
repo = "jsoncpp";
rev = "9059f5cad030ba11d37818847443a53918c327b1";
hash = "sha256-m0tz8w8HbtDitx3Qkn3Rxj/XhASiJVkThdeBxIwv3WI=";
};
nvidia-video-samples = fetchFromGitHub {
owner = "Igalia";
repo = "vk_video_samples";
rev = "45fe88b456c683120138f052ea81f0a958ff3ec4";
hash = "sha256-U5IoiRKXsdletVlnHVz8rgMEwDOZFAuld5Bzs0rvcR4=";
};
spirv-headers = fetchFromGitHub {
owner = "KhronosGroup";
repo = "SPIRV-Headers";
rev = "6d0784e9f1ab92c17eeea94821b2465c14a52be9";
hash = "sha256-zAkAK3Dry7YM2xVs1Uwah2cwe8c8WJERLnsxghaMRiM=";
};
spirv-tools = fetchFromGitHub {
owner = "KhronosGroup";
repo = "SPIRV-Tools";
rev = "f06e0f3d2e5acfe4b14e714e4103dd1ccdb237e5";
hash = "sha256-1t27QeNqGlevMC3BtN70rnPFgUcX/a811+UaUpMWe+o=";
};
video_generator = fetchFromGitHub {
owner = "Igalia";
repo = "video_generator";
rev = "426300e12a5cc5d4676807039a1be237a2b68187";
hash = "sha256-zdYYpX3hed7i5onY7c60LnM/e6PLa3VdrhXTV9oSlvg=";
};
vulkan-docs = fetchFromGitHub {
owner = "KhronosGroup";
repo = "Vulkan-Docs";
rev = "112aee75d162412a4623e7d22a3de52e0233cbf5";
hash = "sha256-6aeaQyNhI30Zr7ZrT7bgSWau24ADSrHnKyyhTjd4ELQ=";
};
vulkan-validationlayers = fetchFromGitHub {
owner = "KhronosGroup";
repo = "Vulkan-ValidationLayers";
rev = "6ae58a2b17b2bcebdc5377995007391b85ffa10f";
hash = "sha256-1Swwe7TsHinOXF1eNAdkDRzujTD/BK4HLxOVzd1tDQ8=";
};
vulkan-video-samples = fetchFromGitHub {
owner = "KhronosGroup";
repo = "Vulkan-Video-Samples";
rev = "a22e0084e6f38a16dc0dcebb4c19a14651a6665b";
hash = "sha256-LXCyFS/hRN4l+z5jNwT9G3MQ05tK+xqgz8uY8qje4jw=";
};
prePatch = ''
mkdir -p external/amber external/glslang external/jsoncpp external/nvidia-video-samples external/spirv-headers external/spirv-tools external/video_generator external/vulkan-docs external/vulkan-validationlayers external/vulkan-video-samples
cp -r ${amber} external/amber/src
cp -r ${glslang} external/glslang/src
cp -r ${jsoncpp} external/jsoncpp/src
cp -r ${nvidia-video-samples} external/nvidia-video-samples/src
cp -r ${spirv-headers} external/spirv-headers/src
cp -r ${spirv-tools} external/spirv-tools/src
cp -r ${video_generator} external/video_generator/src
cp -r ${vulkan-docs} external/vulkan-docs/src
cp -r ${vulkan-validationlayers} external/vulkan-validationlayers/src
cp -r ${vulkan-video-samples} external/vulkan-video-samples/src
'';
}

View File

@@ -0,0 +1,21 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p common-updater-scripts curl jq
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')"
basedir="$(git rev-parse --show-toplevel)"
cd "$basedir"
# Strip prefix
version="$(echo "$rawVersion" | sed 's/vulkan-cts-//')"
update-source-version vulkan-cts "$version"
# Update imported sources
tmpDir="$(mktemp -d)"
trap "rm -rf $tmpDir" EXIT
curl -s "https://raw.githubusercontent.com/KhronosGroup/VK-GL-CTS/$rawVersion/external/fetch_sources.py" -o "$tmpDir/fetch_sources.py"
sed -i '/from ctsbuild.common import/d' "$tmpDir/fetch_sources.py"
cd "$(dirname "$0")"
PYTHONPATH="$tmpDir/" ./vk-cts-sources.py

View File

@@ -0,0 +1,93 @@
#!/usr/bin/env nix-shell
#!nix-shell -i python3 -p nix-prefetch-github -p git
#nix-shell -I nixpkgs=../../../../ -i python3 -p "python3.withPackages (ps: with ps; [ nix-prefetch-github ])" -p "git"
import json
import re
import subprocess
import sys
import fetch_sources
def get_github_hash(owner, repo, revision):
result = subprocess.run(
["nix-prefetch-github", owner, repo, "--json", "--rev", revision],
check=True,
capture_output=True,
text=True,
)
j = json.loads(result.stdout)
# Remove False values
return {k: v for k, v in j.items() if v}
def main():
pkgs = fetch_sources.PACKAGES
pkgs.sort(key = lambda pkg: pkg.baseDir)
existing_sources = {}
# Fetch hashes from existing sources file
with open("sources.nix") as f:
existing_file = f.read()
source_re = re.compile("(?P<name>[^ ]+) = fetchFromGitHub[^\n]*\n"
"[^\n]+\n" # owner
"[^\n]+\n" # repo
" *rev = \"(?P<rev>[^\"]+)\";\n"
" *hash = \"(?P<hash>[^\"]+)\";\n"
)
for m in source_re.finditer(existing_file):
if m.group("hash").startswith("sha"):
print(f"Found {m.group('name')}: {m.group('rev')} -> {m.group('hash')}")
existing_sources[m.group("name")] = (m.group("rev"), m.group("hash"))
print()
# Write new sources file
with open("sources.nix", "w") as f:
f.write("# Autogenerated from vk-cts-sources.py\n")
f.write("{ fetchurl, fetchFromGitHub }:\n")
f.write("rec {");
github_re = re.compile("https://github.com/(?P<owner>[^/]+)/(?P<repo>[^/]+).git")
for pkg in pkgs:
if isinstance(pkg, fetch_sources.GitRepo):
ms = github_re.match(pkg.httpsUrl)
# Check for known hash
hash = None
if pkg.baseDir in existing_sources:
existing_src = existing_sources[pkg.baseDir]
if existing_src[0] == pkg.revision:
hash = existing_src[1]
if hash is None:
print(f"Fetching {pkg.baseDir}: {pkg.revision}")
hash = get_github_hash(ms.group("owner"), ms.group("repo"), pkg.revision)["hash"]
print(f"Got {pkg.baseDir}: {pkg.revision} -> {hash}")
f.write(f"\n {pkg.baseDir} = fetchFromGitHub {{\n");
f.write(f" owner = \"{ms.group('owner')}\";\n");
f.write(f" repo = \"{ms.group('repo')}\";\n");
f.write(f" rev = \"{pkg.revision}\";\n");
f.write(f" hash = \"{hash}\";\n");
f.write(f" }};\n");
f.write("\n prePatch = ''\n");
f.write(" mkdir -p");
for pkg in pkgs:
if isinstance(pkg, fetch_sources.GitRepo):
f.write(f" external/{pkg.baseDir}")
f.write("\n\n");
for pkg in pkgs:
if isinstance(pkg, fetch_sources.GitRepo):
f.write(f" cp -r ${{{pkg.baseDir}}} external/{pkg.baseDir}/{pkg.extractDir}\n");
f.write(" '';\n");
f.write("}\n");
if __name__ == "__main__":
main()