From a06f6c29272c515e8ced560c7c70df4756ec6c54 Mon Sep 17 00:00:00 2001
From: Connor Baker <connor.baker@tweag.io>
Date: Tue, 17 Oct 2023 13:20:19 +0000
Subject: [PATCH 1/4] cudaPackages.nccl-tests: enable builds on platforms.linux

---
 pkgs/development/libraries/science/math/nccl/tests.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/science/math/nccl/tests.nix b/pkgs/development/libraries/science/math/nccl/tests.nix
index 69e45a6aee09..407c7eb0aa65 100644
--- a/pkgs/development/libraries/science/math/nccl/tests.nix
+++ b/pkgs/development/libraries/science/math/nccl/tests.nix
@@ -49,7 +49,7 @@ cudaPackages.backendStdenv.mkDerivation (finalAttrs: {
   meta = with lib; {
     description = "Tests to check both the performance and the correctness of NVIDIA NCCL operations";
     homepage = "https://github.com/NVIDIA/nccl-tests";
-    platforms = [ "x86_64-linux" ];
+    platforms = platforms.linux;
     license = licenses.bsd3;
     broken = !config.cudaSupport || (mpiSupport && mpi == null);
     maintainers = with maintainers; [ jmillerpdt ];

From 68906573e35b963f3e508a4edf4c96bc4d407e71 Mon Sep 17 00:00:00 2001
From: Connor Baker <connor.baker@tweag.io>
Date: Mon, 6 Nov 2023 17:27:10 +0000
Subject: [PATCH 2/4] cudaPackages.nccl-tests: add passthru.updateScript

---
 pkgs/development/libraries/science/math/nccl/tests.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/science/math/nccl/tests.nix b/pkgs/development/libraries/science/math/nccl/tests.nix
index 407c7eb0aa65..0d9093666a84 100644
--- a/pkgs/development/libraries/science/math/nccl/tests.nix
+++ b/pkgs/development/libraries/science/math/nccl/tests.nix
@@ -6,6 +6,7 @@
 , mpi
 , stdenv
 , which
+, gitUpdater
 }:
 
 cudaPackages.backendStdenv.mkDerivation (finalAttrs: {
@@ -46,12 +47,17 @@ cudaPackages.backendStdenv.mkDerivation (finalAttrs: {
     cp -r build/* $out/bin/
   '';
 
+  passthru.updateScript = gitUpdater {
+    inherit (finalAttrs) pname version;
+    rev-prefix = "v";
+  };
+
   meta = with lib; {
     description = "Tests to check both the performance and the correctness of NVIDIA NCCL operations";
     homepage = "https://github.com/NVIDIA/nccl-tests";
     platforms = platforms.linux;
     license = licenses.bsd3;
     broken = !config.cudaSupport || (mpiSupport && mpi == null);
-    maintainers = with maintainers; [ jmillerpdt ];
+    maintainers = with maintainers; [ jmillerpdt ] ++ teams.cuda.members;
   };
 })

From 7e9527b35138c21bdba69c4b7e935639cec70050 Mon Sep 17 00:00:00 2001
From: Connor Baker <connor.baker@tweag.io>
Date: Mon, 6 Nov 2023 17:27:44 +0000
Subject: [PATCH 3/4] cudaPackages.nccl-tests: 2.13.6 -> 2.13.8

---
 .../libraries/science/math/nccl/tests.nix     | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/science/math/nccl/tests.nix b/pkgs/development/libraries/science/math/nccl/tests.nix
index 0d9093666a84..c4ca56f89685 100644
--- a/pkgs/development/libraries/science/math/nccl/tests.nix
+++ b/pkgs/development/libraries/science/math/nccl/tests.nix
@@ -1,41 +1,47 @@
 { config
-, cudaPackages
+, cuda_cccl
+, cuda_cudart
+, cuda_nvcc
+, cudaVersion
+, backendStdenv
 , fetchFromGitHub
 , lib
 , mpiSupport ? false
 , mpi
-, stdenv
+, nccl
 , which
 , gitUpdater
 }:
 
-cudaPackages.backendStdenv.mkDerivation (finalAttrs: {
+backendStdenv.mkDerivation (finalAttrs: {
 
   pname = "nccl-tests";
-  version = "2.13.6";
+  version = "2.13.8";
 
   src = fetchFromGitHub {
     owner = "NVIDIA";
     repo = finalAttrs.pname;
     rev = "v${finalAttrs.version}";
-    hash = "sha256-3gSBQ0g6mnQ/MFXGflE+BqqrIUoiBgp8+fWRQOvLVkw=";
+    hash = "sha256-dxLoflsTHDBnZRTzoXdm30OyKpLlRa73b784YWALBHg=";
   };
 
   strictDeps = true;
 
   nativeBuildInputs = [
-    cudaPackages.cuda_nvcc
+    cuda_nvcc
     which
   ];
 
   buildInputs = [
-    cudaPackages.cuda_cudart
-    cudaPackages.nccl
+    cuda_cudart
+    nccl
+  ] ++ lib.optionals (lib.versionAtLeast cudaVersion "12.0") [
+    cuda_cccl.dev # <nv/target>
   ] ++ lib.optional mpiSupport mpi;
 
   makeFlags = [
-    "CUDA_HOME=${cudaPackages.cuda_nvcc}"
-    "NCCL_HOME=${cudaPackages.nccl}"
+    "CUDA_HOME=${cuda_nvcc}"
+    "NCCL_HOME=${nccl}"
   ] ++ lib.optionals mpiSupport [
     "MPI=1"
   ];

From 2ed23419b6ac2a413f9e5daf2f42eb301490717c Mon Sep 17 00:00:00 2001
From: Connor Baker <connor.baker@tweag.io>
Date: Thu, 9 Nov 2023 15:24:22 +0000
Subject: [PATCH 4/4] cudaPackages.nccl-tests: alphabetize arguments

---
 pkgs/development/libraries/science/math/nccl/tests.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/science/math/nccl/tests.nix b/pkgs/development/libraries/science/math/nccl/tests.nix
index c4ca56f89685..9d826b92f164 100644
--- a/pkgs/development/libraries/science/math/nccl/tests.nix
+++ b/pkgs/development/libraries/science/math/nccl/tests.nix
@@ -1,16 +1,16 @@
-{ config
+{ backendStdenv
+, config
 , cuda_cccl
 , cuda_cudart
 , cuda_nvcc
 , cudaVersion
-, backendStdenv
 , fetchFromGitHub
+, gitUpdater
 , lib
-, mpiSupport ? false
 , mpi
+, mpiSupport ? false
 , nccl
 , which
-, gitUpdater
 }:
 
 backendStdenv.mkDerivation (finalAttrs: {