diff --git a/pkgs/development/libraries/arrayfire/default.nix b/pkgs/development/libraries/arrayfire/default.nix
index 473dd638712c..5ea144ef9bc3 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
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 ];