nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 07:53:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

cudaPackages: undo the cudaPackages_11_3 fallback

Browse Source 
...for cupy and librealsense; this commit is within the process of
stabilizing after the gcc10->gcc11 bump
This commit is contained in:
Someone Serge 2022-04-20 22:50:11 +03:00
parent e8f3e829a7
commit d5239ed8d0
No known key found for this signature in database
GPG Key ID: 7B0E3B1390D61DA4
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/top-level/all-packages.nix
View File

@ -3582,7 +3582,6 @@ with pkgs;
gpu-burn = callPackage ../applications/misc/gpu-burn { gpu-burn = callPackage ../applications/misc/gpu-burn {
# gpu-burn doesn't build on gcc11. CUDA 11.3 is the last version to use # gpu-burn doesn't build on gcc11. CUDA 11.3 is the last version to use
# pre-gcc11, in particular gcc9. # pre-gcc11, in particular gcc9.
cudatoolkit = cudaPackages_11_3.cudatoolkit;
stdenv = gcc9Stdenv; stdenv = gcc9Stdenv;
}; };
@ -23108,7 +23107,6 @@ with pkgs;
cudaSupport = true; cudaSupport = true;
# librealsenseWithCuda doesn't build on gcc11. CUDA 11.3 is the last version # librealsenseWithCuda doesn't build on gcc11. CUDA 11.3 is the last version
# to use pre-gcc11, in particular gcc9. # to use pre-gcc11, in particular gcc9.
cudaPackages = cudaPackages_11_3;
stdenv = gcc9Stdenv; stdenv = gcc9Stdenv;
}; };

6
pkgs/top-level/python-packages.nix
View File

@ -1958,11 +1958,7 @@ in {
cufflinks = callPackage ../development/python-modules/cufflinks { }; cufflinks = callPackage ../development/python-modules/cufflinks { };
cupy = callPackage ../development/python-modules/cupy { 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;
};
curio = callPackage ../development/python-modules/curio { }; curio = callPackage ../development/python-modules/curio { };