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

Merge branch 'master' into staging-next

Browse Source
This commit is contained in:
Jan Tojnar
2020-03-31 21:32:15 +02:00
parent a803f716bd a8811cb82b
commit 3e0f4e202f
359 changed files with 9618 additions and 2647 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/python-packages.nix
+52 -9
View File
@@ -658,6 +658,8 @@ in {
exchangelib = callPackage ../development/python-modules/exchangelib { };
dcmstack = callPackage ../development/python-modules/dcmstack { };
dbus-python = callPackage ../development/python-modules/dbus {
inherit (pkgs) dbus pkgconfig;
};
@@ -3314,6 +3316,8 @@ in {
rethinkdb = callPackage ../development/python-modules/rethinkdb { };
roku = callPackage ../development/python-modules/roku { };
roman = callPackage ../development/python-modules/roman { };
rotate-backups = callPackage ../tools/backup/rotate-backups { };
@@ -5854,6 +5858,8 @@ in {
user-agents = callPackage ../development/python-modules/user-agents { };
variants = callPackage ../development/python-modules/variants { };
verboselogs = callPackage ../development/python-modules/verboselogs { };
vega_datasets = callPackage ../development/python-modules/vega_datasets { };
@@ -6171,7 +6177,9 @@ in {
subdownloader = callPackage ../development/python-modules/subdownloader { };
subunit = callPackage ../development/python-modules/subunit { };
subunit = callPackage ../development/python-modules/subunit {
inherit (pkgs) subunit pkg-config cppunit check;
};
sure = callPackage ../development/python-modules/sure { };
@@ -6458,9 +6466,12 @@ in {
inherit (pkgs) libversion pkgconfig;
};
libvirt = callPackage ../development/python-modules/libvirt {
libvirt = if isPy3k then (callPackage ../development/python-modules/libvirt {
inherit (pkgs) libvirt pkgconfig;
};
}) else (callPackage ../development/python-modules/libvirt/5.9.0.nix {
inherit (pkgs) pkgconfig;
libvirt = pkgs.libvirt_5_9_0;
});
rpdb = callPackage ../development/python-modules/rpdb { };
@@ -6731,21 +6742,39 @@ in {
zerobin = callPackage ../development/python-modules/zerobin { };
tensorflow-estimator = callPackage ../development/python-modules/tensorflow-estimator { };
tensorflow-estimator_1_15_1 = callPackage ../development/python-modules/tensorflow-estimator/1_15_1.nix { };
tensorflow-estimator = self.tensorflow-estimator_1;
tensorflow-estimator_1 = callPackage ../development/python-modules/tensorflow-estimator/1 { };
tensorflow-estimator_2 = callPackage ../development/python-modules/tensorflow-estimator/2 { };
tensorflow-probability = callPackage ../development/python-modules/tensorflow-probability { };
tensorflow-tensorboard = callPackage ../development/python-modules/tensorflow-tensorboard { };
tensorflow-tensorboard = self.tensorflow-tensorboard_1;
tensorflow-bin = callPackage ../development/python-modules/tensorflow/bin.nix {
tensorflow-tensorboard_1 = callPackage ../development/python-modules/tensorflow-tensorboard/1 { };
tensorflow-tensorboard_2 = callPackage ../development/python-modules/tensorflow-tensorboard/2 { };
tensorflow-bin = self.tensorflow-bin_1;
tensorflow-bin_1 = callPackage ../development/python-modules/tensorflow/1/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 {
tensorflow-bin_2 = callPackage ../development/python-modules/tensorflow/2/bin.nix {
cudaSupport = pkgs.config.cudaSupport or false;
inherit (pkgs.linuxPackages) nvidia_x11;
cudatoolkit = pkgs.cudatoolkit_10;
cudnn = pkgs.cudnn_cudatoolkit_10;
};
tensorflow-build = self.tensorflow-build_1;
tensorflow-build_1 = callPackage ../development/python-modules/tensorflow/1 {
cudaSupport = pkgs.config.cudaSupport or false;
inherit (pkgs.linuxPackages) nvidia_x11;
cudatoolkit = pkgs.cudatoolkit_10;
@@ -6755,7 +6784,19 @@ in {
inherit (pkgs.darwin.apple_sdk.frameworks) Foundation Security;
};
tensorflow = self.tensorflow-build;
tensorflow-build_2 = callPackage ../development/python-modules/tensorflow/2 {
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;
openssl = pkgs.openssl_1_1;
inherit (pkgs.darwin.apple_sdk.frameworks) Foundation Security;
};
tensorflow = self.tensorflow_1;
tensorflow_1 = self.tensorflow-build_1;
tensorflow_2 = self.tensorflow-build_2;
tensorflowWithoutCuda = self.tensorflow.override {
cudaSupport = false;
@@ -7016,6 +7057,8 @@ in {
pyemd = callPackage ../development/python-modules/pyemd { };
openwrt-luci-rpc = disabledIf (!isPy3k) (callPackage ../development/python-modules/openwrt-luci-rpc { });
pulp = callPackage ../development/python-modules/pulp { };
behave = callPackage ../development/python-modules/behave { };