cudaPackages: name and consolidate use of fixups pattern (#404973)

Author: SomeoneSerge

pkgs/development/cuda-modules/README.md

@@ -27,6 +27,12 @@ scope. These are typically required for the creation of the finalized
     to `cudaPackages` scope.
 - `cudnn`: NVIDIA cuDNN library.
 - `cutensor`: NVIDIA cuTENSOR library.
+- `fixups`: Each file or directory (excluding `default.nix`) should contain a
+    `callPackage`-able expression to be provided to the `overrideAttrs` attribute
+    of a package produced by the generic manifest builder.
+    These fixups are applied by `pname`, so packages with multiple versions
+    (e.g., `cudnn`, `cudnn_8_9`, etc.) all share a single fixup function
+    (i.e., `fixups/cudnn.nix`).
 - `generic-builders`:
   - Contains a builder `manifest.nix` which operates on the `Manifest` type
       defined in `modules/generic/manifests`. Most packages are built using this

pkgs/development/cuda-modules/cuda-library-samples/generic.nix

@@ -1,36 +1,33 @@
 {
-  lib,
-  backendStdenv,
-  fetchFromGitHub,
-  cmake,
   addDriverRunpath,
   autoAddDriverRunpath,
+  autoPatchelfHook,
+  backendStdenv,
+  cmake,
+  cuda_cccl ? null,
+  cuda_cudart ? null,
+  cuda_nvcc ? null,
+  cudaAtLeast,
+  cudaOlder,
   cudatoolkit,
-  cutensor,
-  cusparselt,
-  cudaPackages,
+  cusparselt ? null,
+  cutensor ? null,
+  fetchFromGitHub,
+  lib,
+  libcusparse ? null,
   setupCudaHook,
-  autoPatchelfHook,
 }:
 
 let
-  inherit (cudaPackages)
-    cuda_cccl
-    cuda_cudart
-    cuda_nvcc
-    libcusparse
-    cudaAtLeast
-    cudaOlder
-    ;
-  rev = "e57b9c483c5384b7b97b7d129457e5a9bdcdb5e1";
-  src = fetchFromGitHub {
-    owner = "NVIDIA";
-    repo = "CUDALibrarySamples";
-    inherit rev;
-    sha256 = "0g17afsmb8am0darxchqgjz1lmkaihmnn7k1x4ahg5gllcmw8k3l";
-  };
-  commonAttrs = {
-    version = lib.strings.substring 0 7 rev + "-" + lib.versions.majorMinor cudatoolkit.version;
+  base = backendStdenv.mkDerivation (finalAttrs: {
+    src = fetchFromGitHub {
+      owner = "NVIDIA";
+      repo = "CUDALibrarySamples";
+      rev = "e57b9c483c5384b7b97b7d129457e5a9bdcdb5e1";
+      sha256 = "0g17afsmb8am0darxchqgjz1lmkaihmnn7k1x4ahg5gllcmw8k3l";
+    };
+    version =
+      lib.strings.substring 0 7 finalAttrs.src.rev + "-" + lib.versions.majorMinor cudatoolkit.version;
     nativeBuildInputs = [
       cmake
       addDriverRunpath
@@ -53,64 +50,63 @@ let
       maintainers = with lib.maintainers; [ obsidian-systems-maintenance ];
       teams = [ lib.teams.cuda ];
     };
-  };
+  });
 in
 
 {
-  cublas = backendStdenv.mkDerivation (
-    commonAttrs
-    // {
+  cublas = base.overrideAttrs (
+    finalAttrs: _: {
       pname = "cuda-library-samples-cublas";
-
-      src = "${src}/cuBLASLt";
+      sourceRoot = "${finalAttrs.src.name}/cuBLASLt";
     }
   );
 
-  cusolver = backendStdenv.mkDerivation (
-    commonAttrs
-    // {
+  cusolver = base.overrideAttrs (
+    finalAttrs: _: {
       pname = "cuda-library-samples-cusolver";
-
-      src = "${src}/cuSOLVER";
-
-      sourceRoot = "cuSOLVER/gesv";
+      sourceRoot = "${finalAttrs.src.name}/cuSOLVER/gesv";
     }
   );
 
-  cutensor = backendStdenv.mkDerivation (
-    commonAttrs
-    // {
+  cutensor = base.overrideAttrs (
+    finalAttrs: prevAttrs: {
       pname = "cuda-library-samples-cutensor";
 
-      src = "${src}/cuTENSOR";
+      sourceRoot = "${finalAttrs.src.name}/cuTENSOR";
 
-      buildInputs = [ cutensor ];
+      buildInputs = prevAttrs.buildInputs or [ ] ++ [ cutensor ];
 
-      cmakeFlags = [ "-DCUTENSOR_EXAMPLE_BINARY_INSTALL_DIR=${builtins.placeholder "out"}/bin" ];
+      cmakeFlags = prevAttrs.cmakeFlags or [ ] ++ [
+        "-DCUTENSOR_EXAMPLE_BINARY_INSTALL_DIR=${builtins.placeholder "out"}/bin"
+      ];
 
       # CUTENSOR_ROOT is double escaped
-      postPatch = ''
-        substituteInPlace CMakeLists.txt \
-          --replace-fail "\''${CUTENSOR_ROOT}/include" "${cutensor.dev}/include"
-      '';
+      postPatch =
+        prevAttrs.postPatch or ""
+        + ''
+          substituteInPlace CMakeLists.txt \
+            --replace-fail "\''${CUTENSOR_ROOT}/include" "${lib.getDev cutensor}/include"
+        '';
 
       CUTENSOR_ROOT = cutensor;
+
+      meta = prevAttrs.meta or { } // {
+        broken = cutensor == null;
+      };
     }
   );
 
-  cusparselt = backendStdenv.mkDerivation (
-    commonAttrs
-    // {
+  cusparselt = base.overrideAttrs (
+    finalAttrs: prevAttrs: {
       pname = "cuda-library-samples-cusparselt";
 
-      src = "${src}/cuSPARSELt";
+      sourceRoot = "${finalAttrs.src.name}/cuSPARSELt/matmul";
 
-      sourceRoot = "cuSPARSELt/matmul";
-
-      buildInputs = lib.optionals (cudaOlder "11.4") [ cudatoolkit ];
+      buildInputs = prevAttrs.buildInputs or [ ] ++ lib.optionals (cudaOlder "11.4") [ cudatoolkit ];
 
       nativeBuildInputs =
-        [
+        prevAttrs.nativeBuildInputs or [ ]
+        ++ [
           cmake
           addDriverRunpath
           (lib.getDev cusparselt)
@@ -125,22 +121,34 @@ in
           cuda_cccl # <nv/target>
         ];
 
-      postPatch = ''
-        substituteInPlace CMakeLists.txt \
-          --replace-fail "''${CUSPARSELT_ROOT}/lib64/libcusparseLt.so" "${lib.getLib cusparselt}/lib/libcusparseLt.so" \
-          --replace-fail "''${CUSPARSELT_ROOT}/lib64/libcusparseLt_static.a" "${lib.getStatic cusparselt}/lib/libcusparseLt_static.a"
-      '';
-
-      installPhase = ''
-        runHook preInstall
-        mkdir -p $out/bin
-        cp matmul_example $out/bin/
-        cp matmul_example_static $out/bin/
-        runHook postInstall
-      '';
+      postPatch =
+        prevAttrs.postPatch or ""
+        + ''
+          substituteInPlace CMakeLists.txt \
+            --replace-fail "''${CUSPARSELT_ROOT}/lib64/libcusparseLt.so" "${lib.getLib cusparselt}/lib/libcusparseLt.so" \
+            --replace-fail "''${CUSPARSELT_ROOT}/lib64/libcusparseLt_static.a" "${lib.getStatic cusparselt}/lib/libcusparseLt_static.a"
+        '';
+
+      postInstall =
+        prevAttrs.postInstall or ""
+        + ''
+          mkdir -p $out/bin
+          cp matmul_example $out/bin/
+          cp matmul_example_static $out/bin/
+        '';
 
       CUDA_TOOLKIT_PATH = lib.getLib cudatoolkit;
       CUSPARSELT_PATH = lib.getLib cusparselt;
+
+      meta = prevAttrs.meta or { } // {
+        broken =
+          # Base dependencies
+          (cusparselt == null || libcusparse == null)
+          # CUDA 11.4+ dependencies
+          || (cudaAtLeast "11.4" && (cuda_nvcc == null || cuda_cudart == null))
+          # CUDA 12.0+ dependencies
+          || (cudaAtLeast "12.0" && cuda_cccl == null);
+      };
     }
   );
 }

pkgs/development/cuda-modules/cuda/extension.nix

@@ -53,42 +53,13 @@ let
   # buildRedistPackage : callPackage -> PackageName -> Derivation
   buildRedistPackage =
     callPackage: pname:
-    let
+    callPackage ../generic-builders/manifest.nix {
+      inherit pname redistName;
+      # We pass the whole release to the builder because it has logic to handle
+      # the case we're trying to build on an unsupported platform.
       redistribRelease = redistribManifest.${pname};
       featureRelease = featureManifest.${pname};
-      drv =
-        let
-          # get `autoAddDriverRunpath` from pkgs instead of cudaPackages' alias to avoid warning
-          inherit (callPackage ({ pkgs }: pkgs) { }) autoAddDriverRunpath;
-        in
-        (callPackage ../generic-builders/manifest.nix {
-          # We pass the whole release to the builder because it has logic to handle
-          # the case we're trying to build on an unsupported platform.
-          inherit
-            pname
-            redistName
-            redistribRelease
-            featureRelease
-            autoAddDriverRunpath
-            ;
-        }).overrideAttrs
-          (prevAttrs: {
-            # Add the package-specific license.
-            meta = prevAttrs.meta // {
-              license =
-                let
-                  licensePath =
-                    if redistribRelease.license_path != null then
-                      redistribRelease.license_path
-                    else
-                      "${pname}/LICENSE.txt";
-                  url = "https://developer.download.nvidia.com/compute/cuda/redist/${licensePath}";
-                in
-                lib.licenses.nvidiaCudaRedist // { inherit url; };
-            };
-          });
-    in
-    drv;
+    };
 
   # Build all the redist packages given final and prev.
   redistPackages =