From 7baf5b3497c7594029a783d5c78baf6f8a06b3b7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 May 2024 18:58:55 +0000 Subject: [PATCH 1/2] opencl-clhpp: 2.0.15 -> 2024.05.08 --- pkgs/development/libraries/opencl-clhpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/opencl-clhpp/default.nix b/pkgs/development/libraries/opencl-clhpp/default.nix index 8410aa4aa063..58709dcd8699 100644 --- a/pkgs/development/libraries/opencl-clhpp/default.nix +++ b/pkgs/development/libraries/opencl-clhpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "opencl-clhpp"; - version = "2.0.15"; + version = "2024.05.08"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenCL-CLHPP"; rev = "v${version}"; - sha256 = "sha256-A12GdevbMaO2QkGAk3VsXzwcDkF+6dEapse2xfdqzPM="; + sha256 = "sha256-bIm4tGqwWX0IPKH3BwLgkf0T7YFrkN6vemYvdPrqUpw="; }; nativeBuildInputs = [ cmake python3 ]; From d62cf4c9fd63aae24b849d1da6eec6c16ae36f60 Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman Date: Sat, 17 Aug 2024 18:00:13 +0300 Subject: [PATCH 2/2] arrayfire: apply patch for newer opencl-clhpp --- pkgs/development/libraries/arrayfire/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/arrayfire/default.nix b/pkgs/development/libraries/arrayfire/default.nix index d52191c56533..e13585ec68ca 100644 --- a/pkgs/development/libraries/arrayfire/default.nix +++ b/pkgs/development/libraries/arrayfire/default.nix @@ -49,6 +49,7 @@ # { libsOnly = true; }; # } , nvidiaComputeDrivers ? null +, fetchpatch }: # ArrayFire compiles with 64-bit BLAS, but some tests segfault or throw @@ -130,7 +131,15 @@ stdenv.mkDerivation rec { # ArrayFire have a repo with assets for the examples. Since we don't build # the examples anyway, remove the dependency on assets. - patches = [ ./no-assets.patch ./no-download.patch ]; + patches = [ + ./no-assets.patch + ./no-download.patch + # Fix for newer opencl-clhpp. Remove with the next release. + (fetchpatch { + url = "https://github.com/arrayfire/arrayfire/pull/3562.patch"; + hash = "sha256-AdWlpcRTn9waNAaVpZfK6sJ/xBQLiBC4nBeEYiGNN50"; + }) + ]; postPatch = '' mkdir -p ./extern/af_glad-src