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

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Orivej Desh
2020-03-23 00:53:16 +00:00
parent 805f6235df e1c3085354
commit 1b89aa3f7a
802 changed files with 31592 additions and 15462 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/python-packages.nix
+36 -7
View File
@@ -893,6 +893,8 @@ in {
markerlib = callPackage ../development/python-modules/markerlib { };
mask-rcnn = callPackage ../development/python-modules/mask-rcnn { };
matchpy = callPackage ../development/python-modules/matchpy { };
maxminddb = callPackage ../development/python-modules/maxminddb { };
@@ -1519,11 +1521,11 @@ in {
sniffio = callPackage ../development/python-modules/sniffio { };
spyder-kernels = if isPy3k then callPackage ../development/python-modules/spyder-kernels {}
else callPackage ../development/python-modules/spyder-kernels/2.nix {};
spyder-kernels = callPackage ../development/python-modules/spyder-kernels {};
spyder-kernels_0_5 = callPackage ../development/python-modules/spyder-kernels/0.x.nix {};
spyder = if isPy3k then callPackage ../development/python-modules/spyder {}
else callPackage ../development/python-modules/spyder/2.nix {};
spyder = callPackage ../development/python-modules/spyder {};
spyder_3 = callPackage ../development/python-modules/spyder/3.nix { };
tenacity = callPackage ../development/python-modules/tenacity { };
@@ -1818,6 +1820,8 @@ in {
base58 = callPackage ../development/python-modules/base58 {};
batchgenerators = callPackage ../development/python-modules/batchgenerators { };
batinfo = callPackage ../development/python-modules/batinfo {};
bcdoc = callPackage ../development/python-modules/bcdoc {};
@@ -2715,6 +2719,12 @@ in {
ffmpeg-python = callPackage ../development/python-modules/ffmpeg-python { };
fenics = callPackage ../development/libraries/science/math/fenics {
inherit (pkgs) pkg-config;
mpi = pkgs.openmpi;
pytest = self.pytest_4;
};
filetype = callPackage ../development/python-modules/filetype { };
flammkuchen = callPackage ../development/python-modules/flammkuchen { };
@@ -2783,7 +2793,7 @@ in {
gitdb = callPackage ../development/python-modules/gitdb { };
gitdb2 = callPackage ../development/python-modules/gitdb2 { };
gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14
GitPython = callPackage ../development/python-modules/GitPython { };
@@ -4162,6 +4172,11 @@ in {
inherit (pkgs.linuxPackages) nvidia_x11;
};
libgpiod = disabledIf (!isPy3k) (toPythonModule (pkgs.libgpiod.override {
enablePython = true;
python3 = python;
}));
libkeepass = callPackage ../development/python-modules/libkeepass { };
librepo = pipe pkgs.librepo [
@@ -4632,7 +4647,7 @@ in {
offtrac = callPackage ../development/python-modules/offtrac { };
openpyxl = if isPy3k then
openpyxl = if pythonAtLeast "3.6" then
callPackage ../development/python-modules/openpyxl { }
else
callPackage ../development/python-modules/openpyxl/2.nix { };
@@ -4914,6 +4929,8 @@ in {
ppft = callPackage ../development/python-modules/ppft { };
pproxy = callPackage ../development/python-modules/pproxy { };
praw = if isPy3k then callPackage ../development/python-modules/praw { }
else callPackage ../development/python-modules/praw/6.3.nix { };
@@ -5660,10 +5677,14 @@ in {
sphinxcontrib-devhelp = callPackage ../development/python-modules/sphinxcontrib-devhelp {};
sphinxcontrib-fulltoc = callPackage ../development/python-modules/sphinxcontrib-fulltoc { };
sphinxcontrib-htmlhelp = callPackage ../development/python-modules/sphinxcontrib-htmlhelp {};
sphinxcontrib-jsmath = callPackage ../development/python-modules/sphinxcontrib-jsmath {};
sphinxcontrib-katex = callPackage ../development/python-modules/sphinxcontrib-katex { };
sphinxcontrib-qthelp = callPackage ../development/python-modules/sphinxcontrib-qthelp {};
sphinxcontrib-serializinghtml = callPackage ../development/python-modules/sphinxcontrib-serializinghtml {};
@@ -5763,7 +5784,7 @@ in {
smmap = callPackage ../development/python-modules/smmap { };
smmap2 = callPackage ../development/python-modules/smmap2 { };
smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14
transaction = callPackage ../development/python-modules/transaction { };
@@ -6254,6 +6275,8 @@ in {
wsgiproxy2 = callPackage ../development/python-modules/wsgiproxy2 { };
wsgitools = callPackage ../development/python-modules/wsgitools { };
wurlitzer = callPackage ../development/python-modules/wurlitzer { };
xcaplib = callPackage ../development/python-modules/xcaplib { };
@@ -6744,6 +6767,8 @@ in {
threadpool = callPackage ../development/python-modules/threadpool { };
threadpoolctl = callPackage ../development/python-modules/threadpoolctl { };
rocket-errbot = callPackage ../development/python-modules/rocket-errbot { };
Yapsy = callPackage ../development/python-modules/yapsy { };
@@ -6949,6 +6974,8 @@ in {
yahooweather = callPackage ../development/python-modules/yahooweather { };
somajo = callPackage ../development/python-modules/somajo { };
spacy = callPackage ../development/python-modules/spacy { };
spacy_models = callPackage ../development/python-modules/spacy/models.nix { };
@@ -7099,6 +7126,8 @@ in {
pybotvac = callPackage ../development/python-modules/pybotvac { };
pymetno = callPackage ../development/python-modules/pymetno { };
pytado = callPackage ../development/python-modules/pytado { };
casttube = callPackage ../development/python-modules/casttube { };