From e24150497bfc2c6e540957f1b7a9a65ca795473c Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Sun, 30 Aug 2026 14:56:54 -0400
Subject: [PATCH 1/3] zfp: remove `cudatoolkit`

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/zf/zfp/package.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/zf/zfp/package.nix b/pkgs/by-name/zf/zfp/package.nix
index 2682e785bf5a..a4fdf4dd68ef 100644
--- a/pkgs/by-name/zf/zfp/package.nix
+++ b/pkgs/by-name/zf/zfp/package.nix
@@ -1,6 +1,5 @@
 {
   cmake,
-  cudatoolkit,
   fetchFromGitHub,
   gfortran,
   lib,
@@ -43,10 +42,10 @@ effectiveStdenv.mkDerivation (finalAttrs: {
     ./python312.patch
   ];
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ] ++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc ];
 
   buildInputs =
-    lib.optionals enableCuda [ cudatoolkit ]
+    lib.optionals enableCuda [ cudaPackages.cuda_cudart ]
     ++ lib.optionals enableFortran [ gfortran ]
     ++ lib.optionals enablePython (
       with python3Packages;

From 2155557fa392bebe8bb984f8c90f2ea0e728f02a Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Sun, 30 Aug 2026 15:00:42 -0400
Subject: [PATCH 2/3] zfp: enable strictDeps

__structuredAttrs added in a previous PR

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/zf/zfp/package.nix | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/zf/zfp/package.nix b/pkgs/by-name/zf/zfp/package.nix
index a4fdf4dd68ef..26fe86b39cd9 100644
--- a/pkgs/by-name/zf/zfp/package.nix
+++ b/pkgs/by-name/zf/zfp/package.nix
@@ -28,6 +28,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
   version = "1.0.1";
 
   __structuredAttrs = true;
+  strictDeps = true;
 
   src = fetchFromGitHub {
     owner = "LLNL";
@@ -42,19 +43,21 @@ effectiveStdenv.mkDerivation (finalAttrs: {
     ./python312.patch
   ];
 
-  nativeBuildInputs = [ cmake ] ++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc ];
+  nativeBuildInputs = [
+    cmake
+  ]
+  ++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc ]
+  ++ lib.optionals enableFortran [ gfortran ]
+  ++ lib.optionals enablePython (
+    with python3Packages;
+    [
+      cython
+      numpy
+      python
+    ]
+  );
 
-  buildInputs =
-    lib.optionals enableCuda [ cudaPackages.cuda_cudart ]
-    ++ lib.optionals enableFortran [ gfortran ]
-    ++ lib.optionals enablePython (
-      with python3Packages;
-      [
-        cython
-        numpy
-        python
-      ]
-    );
+  buildInputs = lib.optionals enableCuda [ cudaPackages.cuda_cudart ];
 
   propagatedBuildInputs = lib.optionals (enableOpenMP && effectiveStdenv.cc.isClang) [
     llvmPackages.openmp

From 25a55d723239ebb74dc8636c54a88d19acb4e391 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Tue, 11 Aug 2026 18:29:47 -0400
Subject: [PATCH 3/3] zfp: add versionCheckHook

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/zf/zfp/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/zf/zfp/package.nix b/pkgs/by-name/zf/zfp/package.nix
index 26fe86b39cd9..5ccc3858259c 100644
--- a/pkgs/by-name/zf/zfp/package.nix
+++ b/pkgs/by-name/zf/zfp/package.nix
@@ -16,6 +16,7 @@
   enableOpenMP ? true,
   enablePython ? true,
   enableUtilities ? true,
+  versionCheckHook,
 }@inputs:
 
 let
@@ -98,6 +99,9 @@ effectiveStdenv.mkDerivation (finalAttrs: {
     "ARGS=\"--exclude-regex testzfp\""
   ];
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
   passthru.tests = {
     cmake-config = testers.hasCmakeConfigModules {
       moduleNames = [ "zfp" ];