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
2020-05-27 15:26:50 +02:00
parent c778596f56 1b5925f218
commit 1b7204ab3c
277 changed files with 4061 additions and 1435 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/python-packages.nix
+18 -18
View File
@@ -799,6 +799,8 @@ in {
hdf5 = pkgs.hdf5-mpi;
};
h5netcdf = callPackage ../development/python-modules/h5netcdf { };
ha-ffmpeg = callPackage ../development/python-modules/ha-ffmpeg { };
habanero = callPackage ../development/python-modules/habanero { };
@@ -889,6 +891,8 @@ in {
limitlessled = callPackage ../development/python-modules/limitlessled { };
livelossplot = callPackage ../development/python-modules/livelossplot { };
lmtpd = callPackage ../development/python-modules/lmtpd { };
logster = callPackage ../development/python-modules/logster { };
@@ -1503,6 +1507,8 @@ in {
sklearn-deap = callPackage ../development/python-modules/sklearn-deap { };
skorch = callPackage ../development/python-modules/skorch { };
slackclient = callPackage ../development/python-modules/slackclient { };
slicedimage = callPackage ../development/python-modules/slicedimage { };
@@ -3808,6 +3814,8 @@ in {
cudaSupport = false;
};
pytorch-metric-learning = callPackage ../development/python-modules/pytorch-metric-learning { };
pythondialog = callPackage ../development/python-modules/pythondialog { };
python2-pythondialog = callPackage ../development/python-modules/python2-pythondialog { };
@@ -4273,6 +4281,8 @@ in {
inherit (pkgs) kerberos;
};
lazy_import = callPackage ../development/python-modules/lazy_import { };
lazy-object-proxy = callPackage ../development/python-modules/lazy-object-proxy { };
ldaptor = callPackage ../development/python-modules/ldaptor { };
@@ -5486,21 +5496,6 @@ in {
pyyaml = callPackage ../development/python-modules/pyyaml { };
pyyaml_3 = (callPackage ../development/python-modules/pyyaml { }).overridePythonAttrs (oldAttrs: rec {
version = "3.13";
src = oldAttrs.src.override {
inherit version;
sha256 = "3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf";
};
# https://github.com/yaml/pyyaml/issues/298#issuecomment-511990948
patches = singleton (pkgs.fetchpatch {
url = "https://github.com/yaml/pyyaml/commit/c5b135fe39d41cffbdc006f28ccb2032df6005e0.patch";
sha256 = "0x1v45rkmj194c41d1nqi3ihj9z4rsy8zvpfcd8p960g1fia7fhn";
});
# https://github.com/yaml/pyyaml/issues/298#issuecomment-511990948
doCheck = false;
});
rabbitpy = callPackage ../development/python-modules/rabbitpy { };
rasterio = callPackage ../development/python-modules/rasterio {
@@ -5597,8 +5592,8 @@ in {
retworkx = callPackage ../development/python-modules/retworkx { };
rivet = disabledIf isPy3k (toPythonModule (pkgs.rivet.override {
python2 = python;
rivet = disabledIf (!isPy3k) (toPythonModule (pkgs.rivet.override {
python3 = python;
}));
ripser = callPackage ../development/python-modules/ripser { };
@@ -7069,6 +7064,11 @@ in {
pytoml = callPackage ../development/python-modules/pytoml { };
pypamtest = pkgs.libpam-wrapper.override {
enablePython = true;
inherit python;
};
pypandoc = callPackage ../development/python-modules/pypandoc { };
yamllint = callPackage ../development/python-modules/yamllint { };
@@ -7105,7 +7105,7 @@ in {
visitor = callPackage ../development/python-modules/visitor { };
vtk = toPythonModule (pkgs.vtk.override {
vtk = toPythonModule (pkgs.vtk_7.override {
inherit (self) python;
enablePython = true;
});