From 199dda40ae24cf410c93d2e0b37613d8c34d48b0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Dec 2023 10:59:10 +0000 Subject: [PATCH 1/3] opencl-headers: 2023.02.06 -> 2023.12.14 --- pkgs/development/libraries/opencl-headers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/opencl-headers/default.nix b/pkgs/development/libraries/opencl-headers/default.nix index 211a8b6b22e9..50169b1f91bb 100644 --- a/pkgs/development/libraries/opencl-headers/default.nix +++ b/pkgs/development/libraries/opencl-headers/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "opencl-headers"; - version = "2023.02.06"; + version = "2023.12.14"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenCL-Headers"; rev = "v${version}"; - sha256 = "sha256-BJDaDokyHgmyl+bGqCwG1J7iOvu0E3P3iYZ1/krot8s="; + sha256 = "sha256-wF9KQjzYKJf6ulXRy80o53bp6lTtm8q1NubKbcH+RY0="; }; nativeBuildInputs = [ cmake ]; From 55a7977b4c10e8a3bf9e12deb16ca57d906256ca Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 17 Dec 2023 04:20:00 +0000 Subject: [PATCH 2/3] opencl-headers: add reverse dependencies to passthru.tests --- pkgs/development/libraries/opencl-headers/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/opencl-headers/default.nix b/pkgs/development/libraries/opencl-headers/default.nix index 50169b1f91bb..60399c7d4ee0 100644 --- a/pkgs/development/libraries/opencl-headers/default.nix +++ b/pkgs/development/libraries/opencl-headers/default.nix @@ -2,6 +2,9 @@ , stdenv , fetchFromGitHub , cmake +, hashcat +, ocl-icd +, tesseract }: stdenv.mkDerivation rec { @@ -17,6 +20,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + passthru.tests = { + inherit ocl-icd tesseract hashcat; + }; + meta = with lib; { description = "Khronos OpenCL headers version ${version}"; homepage = "https://www.khronos.org/registry/cl/"; From 3572dd8dc64664cf9f3a80d807b1d76886dbfc8d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 17 Dec 2023 04:20:00 +0000 Subject: [PATCH 3/3] opencl-headers: add pkg-config tester --- .../libraries/opencl-headers/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/opencl-headers/default.nix b/pkgs/development/libraries/opencl-headers/default.nix index 60399c7d4ee0..6a00c86105a8 100644 --- a/pkgs/development/libraries/opencl-headers/default.nix +++ b/pkgs/development/libraries/opencl-headers/default.nix @@ -5,16 +5,17 @@ , hashcat , ocl-icd , tesseract +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "opencl-headers"; version = "2023.12.14"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenCL-Headers"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-wF9KQjzYKJf6ulXRy80o53bp6lTtm8q1NubKbcH+RY0="; }; @@ -22,12 +23,17 @@ stdenv.mkDerivation rec { passthru.tests = { inherit ocl-icd tesseract hashcat; + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + moduleNames = [ "OpenCL-Headers" ]; + }; }; meta = with lib; { - description = "Khronos OpenCL headers version ${version}"; + description = "Khronos OpenCL headers version ${finalAttrs.version}"; homepage = "https://www.khronos.org/registry/cl/"; license = licenses.asl20; platforms = platforms.unix; + maintainers = [ ]; }; -} +})