cudatoolkit_11_{3,4}: init at 11.{3,4}.1

4 files changed, 47 insertions, 10 deletions

diff --git a/pkgs/test/cuda/cuda-library-samples/default.nix b/pkgs/test/cuda/cuda-library-samples/default.nix
index 91095fbd3ac..ff256028cdf 100644
--- a/pkgs/test/cuda/cuda-library-samples/default.nix
+++ b/pkgs/test/cuda/cuda-library-samples/default.nix
@@ -1,8 +1,8 @@
 { callPackage
 , cudatoolkit_10_1, cudatoolkit_10_2
-, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2
+, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2, cudatoolkit_11_3, cudatoolkit_11_4
 , cutensor_cudatoolkit_10_1, cutensor_cudatoolkit_10_2
-, cutensor_cudatoolkit_11_0, cutensor_cudatoolkit_11_1, cutensor_cudatoolkit_11_2
+, cutensor_cudatoolkit_11_0, cutensor_cudatoolkit_11_1, cutensor_cudatoolkit_11_2, cutensor_cudatoolkit_11_3, cutensor_cudatoolkit_11_4
 }:
 
 rec {
@@ -37,6 +37,16 @@ rec {
     cutensor_cudatoolkit = cutensor_cudatoolkit_11_2;
   };
 
+  cuda-library-samples_cudatoolkit_11_3 = callPackage ./generic.nix {
+    cudatoolkit = cudatoolkit_11_3;
+    cutensor_cudatoolkit = cutensor_cudatoolkit_11_3;
+  };
+
+  cuda-library-samples_cudatoolkit_11_4 = callPackage ./generic.nix {
+    cudatoolkit = cudatoolkit_11_4;
+    cutensor_cudatoolkit = cutensor_cudatoolkit_11_4;
+  };
+
   cuda-library-samples_cudatoolkit_11 =
-    cuda-library-samples_cudatoolkit_11_2;
+    cuda-library-samples_cudatoolkit_11_4;
 }
diff --git a/pkgs/test/cuda/cuda-samples/default.nix b/pkgs/test/cuda/cuda-samples/default.nix
index 1a361c57214..5b46a0651eb 100644
--- a/pkgs/test/cuda/cuda-samples/default.nix
+++ b/pkgs/test/cuda/cuda-samples/default.nix
@@ -1,6 +1,6 @@
 { callPackage
 , cudatoolkit_10_0, cudatoolkit_10_1, cudatoolkit_10_2
-, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2
+, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2, cudatoolkit_11_3, cudatoolkit_11_4
 }:
 
 rec {
@@ -40,5 +40,15 @@ rec {
     sha256 = "1p1qjvfbm28l933mmnln02rqrf0cy9kbpsyb488d1haiqzvrazl1";
   };
 
-  cuda-samples_cudatoolkit_11 = cuda-samples_cudatoolkit_11_2;
+  cuda-samples_cudatoolkit_11_3 = callPackage ./generic.nix {
+    cudatoolkit = cudatoolkit_11_3;
+    sha256 = "0kbibb6pgz8j5iq6284axcnmycaha9bw8qlmdp6yfwmnahq1v0yz";
+  };
+
+  cuda-samples_cudatoolkit_11_4 = callPackage ./generic.nix {
+    cudatoolkit = cudatoolkit_11_4;
+    sha256 = "082dkk5y34wyvjgj2p5j1d00rk8xaxb9z0mhvz16bd469r1bw2qk";
+  };
+
+  cuda-samples_cudatoolkit_11 = cuda-samples_cudatoolkit_11_4;
 }
diff --git a/pkgs/test/cuda/cuda-samples/generic.nix b/pkgs/test/cuda/cuda-samples/generic.nix
index 2e3dcc8891f..c5a9e24abd4 100644
--- a/pkgs/test/cuda/cuda-samples/generic.nix
+++ b/pkgs/test/cuda/cuda-samples/generic.nix
@@ -1,6 +1,11 @@
-{ lib, stdenv, fetchFromGitHub
-, pkg-config, addOpenGLRunpath
-, sha256, cudatoolkit
+{ addOpenGLRunpath
+, cudatoolkit
+, fetchFromGitHub
+, fetchpatch
+, lib
+, pkg-config
+, sha256
+, stdenv
 }:
 
 let
@@ -22,6 +27,14 @@ stdenv.mkDerivation {
 
   buildInputs = [ cudatoolkit ];
 
+  # See https://github.com/NVIDIA/cuda-samples/issues/75.
+  patches = lib.optionals (version == "11.3") [
+    (fetchpatch {
+      url = "https://github.com/NVIDIA/cuda-samples/commit/5c3ec60faeb7a3c4ad9372c99114d7bb922fda8d.patch";
+      sha256 = "sha256:15bydf59scmfnldz5yawbjacdxafi50ahgpzq93zlc5xsac5sz6i";
+    })
+  ];
+
   enableParallelBuilding = true;
 
   preConfigure = ''
diff --git a/pkgs/test/cuda/default.nix b/pkgs/test/cuda/default.nix
index aac52e6a4f5..7989e4e2b7d 100644
--- a/pkgs/test/cuda/default.nix
+++ b/pkgs/test/cuda/default.nix
@@ -10,7 +10,9 @@ rec {
     cuda-samples_cudatoolkit_11
     cuda-samples_cudatoolkit_11_0
     cuda-samples_cudatoolkit_11_1
-    cuda-samples_cudatoolkit_11_2;
+    cuda-samples_cudatoolkit_11_2
+    cuda-samples_cudatoolkit_11_3
+    cuda-samples_cudatoolkit_11_4;
 
   cuda-library-samplesPackages = callPackage ./cuda-library-samples { };
   inherit (cuda-library-samplesPackages)
@@ -20,5 +22,7 @@ rec {
     cuda-library-samples_cudatoolkit_11
     cuda-library-samples_cudatoolkit_11_0
     cuda-library-samples_cudatoolkit_11_1
-    cuda-library-samples_cudatoolkit_11_2;
+    cuda-library-samples_cudatoolkit_11_2
+    cuda-library-samples_cudatoolkit_11_3
+    cuda-library-samples_cudatoolkit_11_4;
 }