Merge branch 'staging-next' into staging

This commit is contained in:
Jan Tojnar
2021-03-26 07:53:44 +01:00
195 changed files with 3269 additions and 1871 deletions
+8 -4
View File
@@ -1617,10 +1617,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 { };
@@ -3284,6 +3284,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 { };
@@ -5862,6 +5864,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 { };