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

Merge pull request #89723 from NixOS/python-unstable

Browse Source 
Python package set major updates
This commit is contained in:
Frederik Rietdijk
2020-06-13 10:41:31 +02:00
committed by GitHub
parent b4f85b97f5 3ba9e643fd
commit d2971d15c6
486 changed files with 2043 additions and 1243 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/python-packages.nix
+72 -22
View File
@@ -535,6 +535,8 @@ in {
breezy = callPackage ../development/python-modules/breezy { };
build = callPackage ../development/python-modules/build { };
ciso8601 = callPackage ../development/python-modules/ciso8601 { };
deepdiff = callPackage ../development/python-modules/deepdiff { };
@@ -567,7 +569,10 @@ in {
cadquery = callPackage ../development/python-modules/cadquery { };
catalogue = callPackage ../development/python-modules/catalogue { };
catalogue = if isPy3k then
callPackage ../development/python-modules/catalogue { }
else
callPackage ../development/python-modules/catalogue/1.nix { };
cbeams = callPackage ../misc/cbeams { };
@@ -2101,8 +2106,6 @@ in {
bitstring = callPackage ../development/python-modules/bitstring { };
blaze = callPackage ../development/python-modules/blaze { };
html5-parser = callPackage ../development/python-modules/html5-parser {
inherit (pkgs) pkgconfig;
};
@@ -2279,7 +2282,10 @@ in {
colander = callPackage ../development/python-modules/colander { };
# Backported version of the ConfigParser library of Python 3.3
configparser = callPackage ../development/python-modules/configparser { };
configparser = if pythonOlder "3.6" then
callPackage ../development/python-modules/configparser/4.nix { }
else
callPackage ../development/python-modules/configparser { };
ColanderAlchemy = callPackage ../development/python-modules/colanderalchemy { };
@@ -2323,6 +2329,8 @@ in {
cytoolz = callPackage ../development/python-modules/cytoolz { };
cppy = callPackage ../development/python-modules/cppy { };
cryptacular = callPackage ../development/python-modules/cryptacular { };
cryptography = callPackage ../development/python-modules/cryptography { };
@@ -2525,7 +2533,10 @@ in {
pytest-mpl = callPackage ../development/python-modules/pytest-mpl { };
pytest-mock = callPackage ../development/python-modules/pytest-mock { };
pytest-mock = if isPy3k then
callPackage ../development/python-modules/pytest-mock { }
else
callPackage ../development/python-modules/pytest-mock/2.nix { };
pytest-openfiles = callPackage ../development/python-modules/pytest-openfiles { };
@@ -3059,6 +3070,8 @@ in {
latexcodec = callPackage ../development/python-modules/latexcodec {};
lazy = callPackage ../development/python-modules/lazy { };
libmodulemd = pipe pkgs.libmodulemd [
toPythonModule
@@ -3640,9 +3653,10 @@ in {
duckdb = pkgs.duckdb;
};
dulwich = callPackage ../development/python-modules/dulwich {
inherit (pkgs) git glibcLocales;
};
dulwich = if isPy3k then
callPackage ../development/python-modules/dulwich { }
else
callPackage ../development/python-modules/dulwich/0_19.nix { };
hg-git = callPackage ../development/python-modules/hg-git { };
@@ -4127,7 +4141,10 @@ in {
hkdf = callPackage ../development/python-modules/hkdf { };
httpretty = callPackage ../development/python-modules/httpretty { };
httpretty = if isPy3k then
callPackage ../development/python-modules/httpretty { }
else
callPackage ../development/python-modules/httpretty/0.nix { };
iapws = callPackage ../development/python-modules/iapws { };
@@ -4263,7 +4280,10 @@ in {
keyutils = callPackage ../development/python-modules/keyutils { inherit (pkgs) keyutils; };
kiwisolver = callPackage ../development/python-modules/kiwisolver { };
kiwisolver = if isPy3k then
callPackage ../development/python-modules/kiwisolver { }
else
callPackage ../development/python-modules/kiwisolver/1_1.nix { };
klaus = callPackage ../development/python-modules/klaus {};
@@ -4328,7 +4348,10 @@ in {
libarcus = callPackage ../development/python-modules/libarcus { inherit (pkgs) protobuf; };
libcloud = callPackage ../development/python-modules/libcloud { };
libcloud = if isPy27 then
callPackage ../development/python-modules/libcloud/2.nix { }
else
callPackage ../development/python-modules/libcloud { };
libgpuarray = callPackage ../development/python-modules/libgpuarray {
clblas = pkgs.clblas.override { boost = self.boost; };
@@ -4822,8 +4845,6 @@ in {
graphvizPkg = pkgs.graphviz;
};
odo = callPackage ../development/python-modules/odo { };
offtrac = callPackage ../development/python-modules/offtrac { };
openpyxl = if pythonAtLeast "3.6" then
@@ -5003,6 +5024,8 @@ in {
pep257 = callPackage ../development/python-modules/pep257 { };
pep517 = callPackage ../development/python-modules/pep517 { };
percol = callPackage ../development/python-modules/percol { };
pexif = callPackage ../development/python-modules/pexif { };
@@ -5264,7 +5287,10 @@ in {
pyglet = callPackage ../development/python-modules/pyglet {};
pygments = callPackage ../development/python-modules/Pygments { };
pygments = if isPy3k then
callPackage ../development/python-modules/Pygments { }
else
callPackage ../development/python-modules/Pygments/2_5.nix { };
pygpgme = callPackage ../development/python-modules/pygpgme { };
@@ -5850,7 +5876,10 @@ in {
sphinx-argparse = callPackage ../development/python-modules/sphinx-argparse { };
sphinxcontrib-websupport = callPackage ../development/python-modules/sphinxcontrib-websupport { };
sphinxcontrib-websupport = if isPy3k then
callPackage ../development/python-modules/sphinxcontrib-websupport { }
else
callPackage ../development/python-modules/sphinxcontrib-websupport/1_1.nix { };
hieroglyph = callPackage ../development/python-modules/hieroglyph { };
@@ -6153,7 +6182,10 @@ in {
rpyc = callPackage ../development/python-modules/rpyc { };
rsa = callPackage ../development/python-modules/rsa { };
rsa = if isPy3k then
callPackage ../development/python-modules/rsa { }
else
callPackage ../development/python-modules/rsa/4_0.nix { };
squaremap = callPackage ../development/python-modules/squaremap { };
@@ -6268,7 +6300,10 @@ in {
symengine = pkgs.symengine;
};
sympy = callPackage ../development/python-modules/sympy { };
sympy = if isPy3k then
callPackage ../development/python-modules/sympy { }
else
callPackage ../development/python-modules/sympy/1_5.nix { };
pilkit = callPackage ../development/python-modules/pilkit { };
@@ -6318,7 +6353,10 @@ in {
sorl_thumbnail = callPackage ../development/python-modules/sorl_thumbnail { };
soupsieve = callPackage ../development/python-modules/soupsieve { };
soupsieve = if isPy3k then
callPackage ../development/python-modules/soupsieve { }
else
callPackage ../development/python-modules/soupsieve/1.nix { };
sphinx_rtd_theme = callPackage ../development/python-modules/sphinx_rtd_theme { };
@@ -6494,7 +6532,10 @@ in {
zha-quirks = callPackage ../development/python-modules/zha-quirks { };
zipp = callPackage ../development/python-modules/zipp { };
zipp = if pythonOlder "3.6" then
callPackage ../development/python-modules/zipp/1.nix { }
else
callPackage ../development/python-modules/zipp { };
zope_broken = callPackage ../development/python-modules/zope_broken { };
@@ -7035,11 +7076,17 @@ in {
morphys = callPackage ../development/python-modules/morphys { };
jaraco_functools = callPackage ../development/python-modules/jaraco_functools { };
jaraco_functools = if pythonOlder "3.6" then
callPackage ../development/python-modules/jaraco_functools/2.nix { }
else
callPackage ../development/python-modules/jaraco_functools { };
jaraco_classes = callPackage ../development/python-modules/jaraco_classes { };
jaraco_stream = callPackage ../development/python-modules/jaraco_stream { };
jaraco_stream = if pythonOlder "3.6"
then callPackage ../development/python-modules/jaraco_stream/2.nix { }
else
callPackage ../development/python-modules/jaraco_stream { };
javaobj-py3 = callPackage ../development/python-modules/javaobj-py3 { };
@@ -7251,7 +7298,10 @@ in {
behave = callPackage ../development/python-modules/behave { };
pyhamcrest = callPackage ../development/python-modules/pyhamcrest { };
pyhamcrest = if isPy3k then
callPackage ../development/python-modules/pyhamcrest { }
else
callPackage ../development/python-modules/pyhamcrest/1.nix { };
pyhaversion = callPackage ../development/python-modules/pyhaversion { };