public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2019-08-01 09:42:54 +02:00
parent f498a8b7af ff13b6f1ac
commit 55e4555b77
221 changed files with 37505 additions and 23530 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -502,6 +502,8 @@ in {
diff_cover = callPackage ../development/python-modules/diff_cover { };
diofant = callPackage ../development/python-modules/diofant { };
docrep = callPackage ../development/python-modules/docrep { };
dominate = callPackage ../development/python-modules/dominate { };
@@ -2353,7 +2355,11 @@ in {
image-match = callPackage ../development/python-modules/image-match { };
imbalanced-learn = callPackage ../development/python-modules/imbalanced-learn { };
imbalanced-learn =
if isPy27 then
callPackage ../development/python-modules/imbalanced-learn/0.4.nix { }
else
callPackage ../development/python-modules/imbalanced-learn { };
immutables = callPackage ../development/python-modules/immutables {};
@@ -4723,6 +4729,8 @@ in {
simplegeneric = callPackage ../development/python-modules/simplegeneric { };
shamir-mnemonic = callPackage ../development/python-modules/shamir-mnemonic { };
shodan = callPackage ../development/python-modules/shodan { };
should-dsl = callPackage ../development/python-modules/should-dsl { };
@@ -5186,6 +5194,8 @@ in {
swagger-spec-validator = callPackage ../development/python-modules/swagger-spec-validator { };
openapi-spec-validator = callPackage ../development/python-modules/openapi-spec-validator { };
freezegun = callPackage ../development/python-modules/freezegun { };
taskw = callPackage ../development/python-modules/taskw { };
@@ -5705,15 +5715,22 @@ in {
tensorflow-tensorboard = callPackage ../development/python-modules/tensorflow-tensorboard { };
tensorflow =
if stdenv.isDarwin
then callPackage ../development/python-modules/tensorflow/bin.nix { }
else callPackage ../development/python-modules/tensorflow/bin.nix rec {
cudaSupport = pkgs.config.cudaSupport or false;
inherit (pkgs.linuxPackages) nvidia_x11;
cudatoolkit = pkgs.cudatoolkit_10_0;
cudnn = pkgs.cudnn_cudatoolkit_10_0;
};
tensorflow-bin = callPackage ../development/python-modules/tensorflow/bin.nix {
cudaSupport = pkgs.config.cudaSupport or false;
inherit (pkgs.linuxPackages) nvidia_x11;
cudatoolkit = pkgs.cudatoolkit_10;
cudnn = pkgs.cudnn_cudatoolkit_10;
};
tensorflow-build = callPackage ../development/python-modules/tensorflow {
cudaSupport = pkgs.config.cudaSupport or false;
inherit (pkgs.linuxPackages) nvidia_x11;
cudatoolkit = pkgs.cudatoolkit_10;
cudnn = pkgs.cudnn_cudatoolkit_10;
nccl = pkgs.nccl_cudatoolkit_10;
};
tensorflow = if stdenv.isDarwin then self.tensorflow-bin else self.tensorflow-build;
tensorflowWithoutCuda = self.tensorflow.override {
cudaSupport = false;