about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSomeone Serge <sergei.kozlukov@aalto.fi>2022-04-20 22:50:11 +0300
committerSomeone Serge <sergei.kozlukov@aalto.fi>2022-04-20 22:50:11 +0300
commitd5239ed8d0e6197e1123e0e61b99f58f4a0e584b (patch)
treed37705a4bd2dd42bdbf8998902d15ec105eb2487
parente8f3e829a750794f42634f4975062177e7c5466f (diff)
cudaPackages: undo the cudaPackages_11_3 fallback
...for cupy and librealsense; this commit is within the process of
stabilizing after the gcc10->gcc11 bump
-rw-r--r--pkgs/top-level/all-packages.nix2
-rw-r--r--pkgs/top-level/python-packages.nix6
2 files changed, 1 insertions, 7 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dd46e13dbc422..692c0897e2885 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3582,7 +3582,6 @@ with pkgs;
   gpu-burn = callPackage ../applications/misc/gpu-burn {
     # gpu-burn doesn't build on gcc11. CUDA 11.3 is the last version to use
     # pre-gcc11, in particular gcc9.
-    cudatoolkit = cudaPackages_11_3.cudatoolkit;
     stdenv = gcc9Stdenv;
   };
 
@@ -23108,7 +23107,6 @@ with pkgs;
     cudaSupport = true;
     # librealsenseWithCuda doesn't build on gcc11. CUDA 11.3 is the last version
     # to use pre-gcc11, in particular gcc9.
-    cudaPackages = cudaPackages_11_3;
     stdenv = gcc9Stdenv;
   };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 489a250ba5e4c..4cbede6e070ef 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1958,11 +1958,7 @@ in {
 
   cufflinks = callPackage ../development/python-modules/cufflinks { };
 
-  cupy = callPackage ../development/python-modules/cupy {
-    # cupy doesn't build on gcc11. CUDA 11.3 is the last version to use
-    # pre-gcc11, in particular gcc9.
-    cudaPackages = pkgs.cudaPackages_11_3;
-  };
+  cupy = callPackage ../development/python-modules/cupy { };
 
   curio = callPackage ../development/python-modules/curio { };