Unverified Commit 3340c8e3 authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #270906 from Flakebi/vulkan-cts2 

vulkan-cts: 1.3.7.0 -> 1.3.7.2
parents faef749c 778c8225

pkgs/tools/graphics/vulkan-cts/default.nix

+10 −2
Original line number Diff line number Diff line 
{ lib, stdenv

, fetchFromGitHub

, fetchurl

, runCommand

, cmake

, ffmpeg_4

, libdrm
@@ -12,6 +13,7 @@ 
, libXdmcp

, libxcb

, makeWrapper

, mesa

, ninja

, pkg-config

, python3
@@ -37,13 +39,13 @@ let 
in

stdenv.mkDerivation (finalAttrs: {

  pname = "vulkan-cts";

  version = "1.3.7.0";

  version = "1.3.7.2";



  src = fetchFromGitHub {

    owner = "KhronosGroup";

    repo = "VK-GL-CTS";

    rev = "${finalAttrs.pname}-${finalAttrs.version}";

    hash = "sha256-f7i7gytk3cKeFQD0FR+nrUR2o0FWaJWKG7OpDz9u42E=";

    hash = "sha256-TnHFCEGKgn1U00aUDMX7UEWSeTjzysmX7rOQCZTL8FU=";

  };



  prePatch = ''
@@ -104,6 +106,12 @@ stdenv.mkDerivation (finalAttrs: { 
  '';



  passthru.updateScript = ./update.sh;

  passthru.tests.lavapipe = runCommand "vulkan-cts-tests-lavapipe" { nativeBuildInputs = [ finalAttrs.finalPackage ]; } ''

    # Expand the wildcard to pick the existing architecture

    export VK_ICD_FILENAMES=$(echo ${mesa.drivers}/share/vulkan/icd.d/lvp_icd.*.json)

    deqp-vk -n dEQP-VK.api.smoke.triangle

    touch $out

  '';



  meta = with lib; {

    description = "Khronos Vulkan Conformance Tests";

pkgs/tools/graphics/vulkan-cts/sources.nix

+2 −2
Original line number Diff line number Diff line
@@ -32,8 +32,8 @@ rec { 
  nvidia-video-samples = fetchFromGitHub {

    owner = "Igalia";

    repo = "vk_video_samples";

    rev = "cts-integration-0.9.9-1";

    hash = "sha256-vHUyGAx/n8yTnrFjeefbb8LsHxONxsjH3BG2D/RO99E=";

    rev = "cts-integration-0.9.9-2";

    hash = "sha256-ftHhb5u3l7WbgEu6hHynBnvNbVOn5TFne915M17jiAQ=";

  };



  spirv-headers = fetchFromGitHub {