Merge master into staging-next

This commit is contained in:
github-actions[bot]
2021-03-26 00:15:53 +00:00
committed by GitHub
46 changed files with 814 additions and 409 deletions
+8 -4
View File
@@ -1614,10 +1614,10 @@ in {
cufflinks = callPackage ../development/python-modules/cufflinks { };
cupy = callPackage ../development/python-modules/cupy {
cudatoolkit = pkgs.cudatoolkit_10_0;
cudnn = pkgs.cudnn_cudatoolkit_10_0;
nccl = pkgs.nccl_cudatoolkit_10;
cutensor = pkgs.cutensor_cudatoolkit_10;
cudatoolkit = pkgs.cudatoolkit_11;
cudnn = pkgs.cudnn_cudatoolkit_11;
nccl = pkgs.nccl_cudatoolkit_11;
cutensor = pkgs.cutensor_cudatoolkit_11;
};
curio = callPackage ../development/python-modules/curio { };
@@ -3281,6 +3281,8 @@ in {
imgsize = callPackage ../development/python-modules/imgsize { };
iminuit = callPackage ../development/python-modules/iminuit { };
immutables = callPackage ../development/python-modules/immutables { };
impacket = callPackage ../development/python-modules/impacket { };
@@ -5856,6 +5858,8 @@ in {
pykmtronic = callPackage ../development/python-modules/pykmtronic { };
pykodi = callPackage ../development/python-modules/pykodi { };
pykwalify = callPackage ../development/python-modules/pykwalify { };
pylacrosse = callPackage ../development/python-modules/pylacrosse { };