python2Packages: move python 2 calls into python2-packages.nix

This commit is contained in:
Frederik Rietdijk 2021-03-24 13:10:59 +01:00
parent 4f02e12f8a
commit 187d0371ab
2 changed files with 334 additions and 348 deletions

View File

@ -96,15 +96,18 @@ let
};
});
disabledIf = x: drv:
if x then throw "${removePythonPrefix (drv.pname or drv.name)} not supported for interpreter ${python.executable}" else drv;
disabled = drv: throw "${removePythonPrefix (drv.pname or drv.name)} not supported for interpreter ${python.executable}";
disabledIf = x: drv: if x then disabled drv else drv;
in {
inherit pkgs;
inherit (python.passthru) isPy27 isPy35 isPy36 isPy37 isPy38 isPy39 isPy3k isPyPy pythonAtLeast pythonOlder;
inherit python bootstrapped-pip buildPythonPackage buildPythonApplication;
inherit fetchPypi;
inherit hasPythonModule requiredPythonModules makePythonPath disabledIf;
inherit hasPythonModule requiredPythonModules makePythonPath disabled disabledIf;
inherit toPythonModule toPythonApplication;
inherit buildSetupcfg;
@ -435,8 +438,6 @@ in {
appdirs = callPackage ../development/python-modules/appdirs { };
appleseed = disabledIf isPy3k (toPythonModule (pkgs.appleseed.override { inherit (self) python; }));
application = callPackage ../development/python-modules/application { };
applicationinsights = callPackage ../development/python-modules/applicationinsights { };
@ -520,10 +521,7 @@ in {
astral = callPackage ../development/python-modules/astral { };
astroid = if isPy3k then
callPackage ../development/python-modules/astroid { }
else
callPackage ../development/python-modules/astroid/1.6.nix { };
astroid = callPackage ../development/python-modules/astroid { };
astropy = callPackage ../development/python-modules/astropy { };
@ -1129,8 +1127,6 @@ in {
browser-cookie3 = callPackage ../development/python-modules/browser-cookie3 { };
browsermob-proxy = disabledIf isPy3k (callPackage ../development/python-modules/browsermob-proxy { });
bsddb3 = callPackage ../development/python-modules/bsddb3 { };
bsdiff4 = callPackage ../development/python-modules/bsdiff4 { };
@ -1200,15 +1196,9 @@ in {
inherit (self) python numpy boost;
});
cairocffi = if isPy3k then
callPackage ../development/python-modules/cairocffi { }
else
callPackage ../development/python-modules/cairocffi/0_9.nix { };
cairocffi = callPackage ../development/python-modules/cairocffi { };
cairosvg = if isPy3k then
callPackage ../development/python-modules/cairosvg { }
else
callPackage ../development/python-modules/cairosvg/1_x.nix { };
cairosvg = callPackage ../development/python-modules/cairosvg { };
caldav = callPackage ../development/python-modules/caldav { };
@ -1318,10 +1308,7 @@ in {
characteristic = callPackage ../development/python-modules/characteristic { };
chardet = if isPy3k then
callPackage ../development/python-modules/chardet { }
else
callPackage ../development/python-modules/chardet/2.nix { };
chardet = callPackage ../development/python-modules/chardet { };
chart-studio = callPackage ../development/python-modules/chart-studio { };
@ -1333,10 +1320,7 @@ in {
cheroot = callPackage ../development/python-modules/cheroot { };
cherrypy = if isPy3k then
callPackage ../development/python-modules/cherrypy { }
else
callPackage ../development/python-modules/cherrypy/17.nix { };
cherrypy = callPackage ../development/python-modules/cherrypy { };
chevron = callPackage ../development/python-modules/chevron { };
@ -2002,10 +1986,7 @@ in {
dnslib = callPackage ../development/python-modules/dnslib { };
dnspython = if isPy3k then
callPackage ../development/python-modules/dnspython { }
else
self.dnspython_1;
dnspython = callPackage ../development/python-modules/dnspython { };
dnspython_1 = callPackage ../development/python-modules/dnspython/1.nix { };
@ -2021,7 +2002,7 @@ in {
docker_pycreds = callPackage ../development/python-modules/docker-pycreds { };
docker-py = disabledIf isPy27 (callPackage ../development/python-modules/docker-py { });
docker-py = callPackage ../development/python-modules/docker-py { };
dockerspawner = callPackage ../development/python-modules/dockerspawner { };
@ -2089,10 +2070,7 @@ in {
dugong = callPackage ../development/python-modules/dugong { };
dulwich = if isPy3k then
callPackage ../development/python-modules/dulwich { }
else
callPackage ../development/python-modules/dulwich/0_19.nix { };
dulwich = callPackage ../development/python-modules/dulwich { };
dwdwfsapi = callPackage ../development/python-modules/dwdwfsapi { };
@ -2313,10 +2291,7 @@ in {
fasttext = callPackage ../development/python-modules/fasttext { };
faulthandler = if !isPy3k then
callPackage ../development/python-modules/faulthandler { }
else
throw "faulthandler is built into ${python.executable}";
faulthandler = throw "faulthandler is built into ${python.executable}";
favicon = callPackage ../development/python-modules/favicon { };
@ -2332,10 +2307,7 @@ in {
inherit (pkgs) glibcLocales;
};
feedparser = if isPy3k then
callPackage ../development/python-modules/feedparser { }
else
callPackage ../development/python-modules/feedparser/5.nix { };
feedparser = callPackage ../development/python-modules/feedparser { };
fenics = callPackage ../development/libraries/science/math/fenics {
pytest = self.pytest_4;
@ -2519,10 +2491,10 @@ in {
folium = callPackage ../development/python-modules/folium { };
fontforge = disabledIf (!isPy3k) (toPythonModule (pkgs.fontforge.override {
fontforge = toPythonModule (pkgs.fontforge.override {
withPython = true;
inherit python;
}));
});
fontmath = callPackage ../development/python-modules/fontmath { };
@ -2606,11 +2578,6 @@ in {
fx2 = callPackage ../development/python-modules/fx2 { };
gaia = disabledIf (isPyPy || isPy3k) (toPythonModule (pkgs.gaia.override {
pythonPackages = self;
pythonSupport = true;
})); # gaia isn't supported with python3 and it's not available from pypi
galario = toPythonModule (pkgs.galario.override {
enablePython = true;
pythonPackages = self;
@ -2637,10 +2604,10 @@ in {
ge25519 = callPackage ../development/python-modules/ge25519 { };
geant4 = disabledIf (!isPy3k) (toPythonModule (pkgs.geant4.override {
geant4 = toPythonModule (pkgs.geant4.override {
enablePython = true;
python3 = python;
}));
});
geeknote = callPackage ../development/python-modules/geeknote { };
@ -2674,10 +2641,7 @@ in {
geopandas = callPackage ../development/python-modules/geopandas { };
geopy = if isPy3k then
callPackage ../development/python-modules/geopy { }
else
callPackage ../development/python-modules/geopy/2.nix { };
geopy = callPackage ../development/python-modules/geopy { };
getmac = callPackage ../development/python-modules/getmac { };
@ -2750,18 +2714,7 @@ in {
google-api-core = callPackage ../development/python-modules/google-api-core { };
google-api-python-client =
let google-api-python-client = callPackage ../development/python-modules/google-api-python-client { };
in if isPy3k then
google-api-python-client
else # Python 2.7 support was deprecated but is still needed by weboob and duplicity
google-api-python-client.overridePythonAttrs (old: rec {
version = "1.7.6";
src = old.src.override {
inherit version;
sha256 = "14w5sdrp0bk9n0r2lmpqmrbf2zclpfq6q7giyahnskkfzdkb165z";
};
});
google-api-python-client = callPackage ../development/python-modules/google-api-python-client { };
googleapis-common-protos = callPackage ../development/python-modules/googleapis-common-protos { };
@ -3006,11 +2959,6 @@ in {
gviz-api = callPackage ../development/python-modules/gviz-api {};
gwyddion = disabledIf isPy3k (toPythonModule (pkgs.gwyddion.override {
pythonSupport = true;
pythonPackages = self;
}));
gym = callPackage ../development/python-modules/gym { };
gyp = callPackage ../development/python-modules/gyp { };
@ -3131,10 +3079,7 @@ in {
hstspreload = callPackage ../development/python-modules/hstspreload { };
html2text = if isPy3k then
callPackage ../development/python-modules/html2text { }
else
callPackage ../development/python-modules/html2text/2018.nix { };
html2text = callPackage ../development/python-modules/html2text { };
html5lib = callPackage ../development/python-modules/html5lib { };
@ -3162,10 +3107,7 @@ in {
http-parser = callPackage ../development/python-modules/http-parser { };
httpretty = if isPy3k then
callPackage ../development/python-modules/httpretty { }
else
callPackage ../development/python-modules/httpretty/0.nix { };
httpretty = callPackage ../development/python-modules/httpretty { };
httpserver = callPackage ../development/python-modules/httpserver { };
@ -3216,7 +3158,7 @@ in {
hypothesis-auto = callPackage ../development/python-modules/hypothesis-auto { };
hypothesis = if isPy3k then callPackage ../development/python-modules/hypothesis { } else self.hypothesis_4;
hypothesis = callPackage ../development/python-modules/hypothesis { };
hypothesmith = callPackage ../development/python-modules/hypothesmith { };
@ -3244,10 +3186,7 @@ in {
identify = callPackage ../development/python-modules/identify { };
idna = if isPy3k then
callPackage ../development/python-modules/idna { }
else
callPackage ../development/python-modules/idna/2.nix { };
idna = callPackage ../development/python-modules/idna { };
idna-ssl = callPackage ../development/python-modules/idna-ssl { };
@ -3263,7 +3202,7 @@ in {
ijson = callPackage ../development/python-modules/ijson { };
imagecodecs-lite = disabledIf (!isPy3k) (callPackage ../development/python-modules/imagecodecs-lite { });
imagecodecs-lite = callPackage ../development/python-modules/imagecodecs-lite { };
imagecorruptions = callPackage ../development/python-modules/imagecorruptions { };
@ -3420,11 +3359,7 @@ in {
isodate = callPackage ../development/python-modules/isodate { };
isort = if isPy3k then
callPackage ../development/python-modules/isort { }
else
callPackage ../development/python-modules/isort/4.nix {
};
isort = callPackage ../development/python-modules/isort { };
isoweek = callPackage ../development/python-modules/isoweek { };
@ -3586,15 +3521,9 @@ in {
jupyter-c-kernel = callPackage ../development/python-modules/jupyter-c-kernel { };
jupyter_client = if isPy3k then
callPackage ../development/python-modules/jupyter_client { }
else
callPackage ../development/python-modules/jupyter_client/5.nix { };
jupyter_client = callPackage ../development/python-modules/jupyter_client { };
jupyter_console = if pythonOlder "3.5" then
callPackage ../development/python-modules/jupyter_console/5.nix { }
else
callPackage ../development/python-modules/jupyter_console { };
jupyter_console = callPackage ../development/python-modules/jupyter_console { };
jupyter_core = callPackage ../development/python-modules/jupyter_core { };
@ -3672,10 +3601,7 @@ in {
inherit (pkgs) kerberos;
};
keyring = if isPy3k then
callPackage ../development/python-modules/keyring { }
else
callPackage ../development/python-modules/keyring/2.nix { };
keyring = callPackage ../development/python-modules/keyring { };
keyrings-alt = callPackage ../development/python-modules/keyrings-alt { };
@ -3685,9 +3611,9 @@ in {
inherit (pkgs) keyutils;
};
kicad = disabledIf isPy27 (toPythonModule (pkgs.kicad.override {
kicad = toPythonModule (pkgs.kicad.override {
python3 = python;
}).src);
}).src;
kinparse = callPackage ../development/python-modules/kinparse { };
@ -3699,10 +3625,7 @@ in {
kivy-garden = callPackage ../development/python-modules/kivy-garden { };
kiwisolver = if isPy3k then
callPackage ../development/python-modules/kiwisolver { }
else
callPackage ../development/python-modules/kiwisolver/1_1.nix { };
kiwisolver = callPackage ../development/python-modules/kiwisolver { };
klaus = callPackage ../development/python-modules/klaus { };
@ -3825,10 +3748,10 @@ in {
pythonSupport = true;
});
libgpiod = disabledIf (!isPy3k) (toPythonModule (pkgs.libgpiod.override {
libgpiod = toPythonModule (pkgs.libgpiod.override {
enablePython = true;
python3 = python;
}));
});
libgpuarray = callPackage ../development/python-modules/libgpuarray {
clblas = pkgs.clblas.override { boost = self.boost; };
@ -3861,16 +3784,6 @@ in {
inherit (pkgs) libsodium;
};
libnl-python = disabledIf isPy3k (toPythonModule (pkgs.libnl.override {
pythonSupport = true;
inherit python;
})).py;
libplist = disabledIf isPy3k (toPythonModule (pkgs.libplist.override {
enablePython = true;
inherit python;
})).py;
libpurecool = callPackage ../development/python-modules/libpurecool { };
libredwg = toPythonModule (pkgs.libredwg.override {
@ -3931,14 +3844,9 @@ in {
inherit (pkgs) libversion;
};
libvirt = if isPy3k then
(callPackage ../development/python-modules/libvirt {
libvirt = callPackage ../development/python-modules/libvirt {
inherit (pkgs) libvirt;
})
else
(callPackage ../development/python-modules/libvirt/5.9.0.nix {
libvirt = pkgs.libvirt_5_9_0;
});
};
libxml2 = (toPythonModule (pkgs.libxml2.override {
pythonSupport = true;
@ -4145,10 +4053,7 @@ in {
markdown2 = callPackage ../development/python-modules/markdown2 { };
markdown = if isPy3k then
callPackage ../development/python-modules/markdown { }
else
callPackage ../development/python-modules/markdown/3_1.nix { };
markdown = callPackage ../development/python-modules/markdown { };
markdown-it-py = callPackage ../development/python-modules/markdown-it-py { };
@ -4178,12 +4083,7 @@ in {
mathlibtools = callPackage ../development/python-modules/mathlibtools { };
matplotlib = let
path = if isPy3k then
../development/python-modules/matplotlib/default.nix
else
../development/python-modules/matplotlib/2.nix;
in callPackage path {
matplotlib = callPackage ../development/python-modules/matplotlib/default.nix {
stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv;
inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa;
};
@ -4231,9 +4131,9 @@ in {
memory_profiler = callPackage ../development/python-modules/memory_profiler { };
mercurial = disabledIf (!isPy3k) (toPythonModule (pkgs.mercurial.override {
mercurial = toPythonModule (pkgs.mercurial.override {
python3Packages = self;
}));
});
mergedeep = callPackage ../development/python-modules/mergedeep { };
@ -4245,10 +4145,10 @@ in {
meshlabxml = callPackage ../development/python-modules/meshlabxml { };
meson = disabledIf (pythonOlder "3.5") (toPythonModule ((pkgs.meson.override { python3 = python; }).overrideAttrs
meson = toPythonModule ((pkgs.meson.override { python3 = python; }).overrideAttrs
(oldAttrs: { # We do not want the setup hook in Python packages because the build is performed differently.
setupHook = null;
})));
}));
mesonpep517 = callPackage ../development/python-modules/mesonpep517 { };
@ -4342,7 +4242,7 @@ in {
monkeyhex = callPackage ../development/python-modules/monkeyhex { };
monosat = disabledIf (!isPy3k) (pkgs.monosat.python {
monosat = (pkgs.monosat.python {
inherit buildPythonPackage;
inherit (self) cython;
});
@ -4351,10 +4251,7 @@ in {
monty = callPackage ../development/python-modules/monty { };
more-itertools = if isPy27 then
callPackage ../development/python-modules/more-itertools/2.7.nix { }
else
callPackage ../development/python-modules/more-itertools { };
more-itertools = callPackage ../development/python-modules/more-itertools { };
moretools = callPackage ../development/python-modules/moretools { };
@ -4537,10 +4434,7 @@ in {
nbdime = callPackage ../development/python-modules/nbdime { };
nbformat = if isPy3k then
callPackage ../development/python-modules/nbformat { }
else
callPackage ../development/python-modules/nbformat/2.nix { };
nbformat = callPackage ../development/python-modules/nbformat { };
nbmerge = callPackage ../development/python-modules/nbmerge { };
@ -4576,10 +4470,7 @@ in {
netifaces = callPackage ../development/python-modules/netifaces { };
networkx = if isPy3k then
callPackage ../development/python-modules/networkx { }
else
callPackage ../development/python-modules/networkx/2.2.nix { };
networkx = callPackage ../development/python-modules/networkx { };
neuron-mpi = pkgs.neuron-mpi.override { inherit python; };
@ -4682,10 +4573,7 @@ in {
nosexcover = callPackage ../development/python-modules/nosexcover { };
notebook = if isPy3k then
callPackage ../development/python-modules/notebook { }
else
callPackage ../development/python-modules/notebook/2.nix { };
notebook = callPackage ../development/python-modules/notebook { };
notedown = callPackage ../development/python-modules/notedown { };
@ -4806,17 +4694,9 @@ in {
pythonPackages = self;
});
opencv = disabledIf isPy3k (toPythonModule (pkgs.opencv.override {
enablePython = true;
pythonPackages = self;
}));
openidc-client = callPackage ../development/python-modules/openidc-client { };
openpyxl = if pythonAtLeast "3.6" then
callPackage ../development/python-modules/openpyxl { }
else
callPackage ../development/python-modules/openpyxl/2.nix { };
openpyxl = callPackage ../development/python-modules/openpyxl { };
openrazer = callPackage ../development/python-modules/openrazer/pylib.nix { };
@ -4832,14 +4712,11 @@ in {
openwebifpy = callPackage ../development/python-modules/openwebifpy { };
openwrt-luci-rpc = disabledIf (!isPy3k) (callPackage ../development/python-modules/openwrt-luci-rpc { });
openwrt-luci-rpc = callPackage ../development/python-modules/openwrt-luci-rpc { };
openwrt-ubus-rpc = callPackage ../development/python-modules/openwrt-ubus-rpc { };
opt-einsum = if isPy27 then
callPackage ../development/python-modules/opt-einsum/2.nix { }
else
callPackage ../development/python-modules/opt-einsum { };
opt-einsum = callPackage ../development/python-modules/opt-einsum { };
optuna = callPackage ../development/python-modules/optuna { };
@ -4881,9 +4758,7 @@ in {
packageurl-python = callPackage ../development/python-modules/packageurl-python { };
packaging = if isPy3k
then callPackage ../development/python-modules/packaging { }
else callPackage ../development/python-modules/packaging/2.nix { };
packaging = callPackage ../development/python-modules/packaging { };
packet-python = callPackage ../development/python-modules/packet-python { };
@ -4904,10 +4779,7 @@ in {
pamqp = callPackage ../development/python-modules/pamqp { };
pandas = if isPy3k then
callPackage ../development/python-modules/pandas { }
else
callPackage ../development/python-modules/pandas/2.nix { };
pandas = callPackage ../development/python-modules/pandas { };
pandas-datareader = callPackage ../development/python-modules/pandas-datareader { };
@ -4987,10 +4859,7 @@ in {
pathos = callPackage ../development/python-modules/pathos { };
pathpy = if isPy3k then
callPackage ../development/python-modules/path.py { }
else
callPackage ../development/python-modules/path.py/2.nix { };
pathpy = callPackage ../development/python-modules/path.py { };
pathspec = callPackage ../development/python-modules/pathspec { };
@ -5144,10 +5013,7 @@ in {
pint = callPackage ../development/python-modules/pint { };
pip = if isPy3k then
callPackage ../development/python-modules/pip { }
else
callPackage ../development/python-modules/pip/20.nix { };
pip = callPackage ../development/python-modules/pip { };
pipdate = callPackage ../development/python-modules/pipdate { };
@ -5276,7 +5142,7 @@ in {
poster3 = callPackage ../development/python-modules/poster3 { };
postorius = disabledIf (!isPy3k) (callPackage ../servers/mail/mailman/postorius.nix { });
postorius = callPackage ../servers/mail/mailman/postorius.nix { };
potr = callPackage ../development/python-modules/potr { };
@ -5304,10 +5170,7 @@ in {
prawcore = callPackage ../development/python-modules/prawcore { };
praw = if isPy3k then
callPackage ../development/python-modules/praw { }
else
callPackage ../development/python-modules/praw/6.3.nix { };
praw = callPackage ../development/python-modules/praw { };
precis-i18n = callPackage ../development/python-modules/precis-i18n { };
@ -5323,10 +5186,7 @@ in {
pretend = callPackage ../development/python-modules/pretend { };
prettytable = if isPy3k then
callPackage ../development/python-modules/prettytable { }
else
callPackage ../development/python-modules/prettytable/1.nix { };
prettytable = callPackage ../development/python-modules/prettytable { };
primer3 = callPackage ../development/python-modules/primer3 { };
@ -5360,12 +5220,7 @@ in {
promise = callPackage ../development/python-modules/promise { };
prompt_toolkit = let
filename = if isPy3k then
../development/python-modules/prompt_toolkit
else
../development/python-modules/prompt_toolkit/1.nix;
in callPackage filename { };
prompt_toolkit = callPackage ../development/python-modules/prompt_toolkit { };
property-manager = callPackage ../development/python-modules/property-manager { };
@ -5550,7 +5405,7 @@ in {
py = callPackage ../development/python-modules/py { };
pycangjie = disabledIf (!isPy3k) (callPackage ../development/python-modules/pycangjie { });
pycangjie = callPackage ../development/python-modules/pycangjie { };
pycapnp = callPackage ../development/python-modules/pycapnp { };
@ -5647,15 +5502,9 @@ in {
pydispatcher = callPackage ../development/python-modules/pydispatcher { };
pydns = let
py3 = callPackage ../development/python-modules/py3dns { };
py2 = callPackage ../development/python-modules/pydns { };
in if isPy3k then py3 else py2;
pydns = callPackage ../development/python-modules/py3dns { };
pydocstyle = if isPy27 then
callPackage ../development/python-modules/pydocstyle/2.nix { }
else
callPackage ../development/python-modules/pydocstyle { };
pydocstyle = callPackage ../development/python-modules/pydocstyle { };
pydocumentdb = callPackage ../development/python-modules/pydocumentdb { };
@ -5703,8 +5552,6 @@ in {
pyexcel-xls = callPackage ../development/python-modules/pyexcel-xls { };
pyexiv2 = disabledIf isPy3k (toPythonModule (callPackage ../development/python-modules/pyexiv2 { }));
pyext = callPackage ../development/python-modules/pyext { };
pyface = callPackage ../development/python-modules/pyface { };
@ -5773,10 +5620,7 @@ in {
pygments-better-html = callPackage ../development/python-modules/pygments-better-html { };
pygments = if isPy3k then
callPackage ../development/python-modules/Pygments { }
else
callPackage ../development/python-modules/Pygments/2_5.nix { };
pygments = callPackage ../development/python-modules/Pygments { };
pygments-markdown-lexer = callPackage ../development/python-modules/pygments-markdown-lexer { };
@ -5786,14 +5630,9 @@ in {
pygobject2 = callPackage ../development/python-modules/pygobject { };
pygobject3 = if isPy3k then
callPackage ../development/python-modules/pygobject/3.nix {
inherit (pkgs) meson;
}
else
callPackage ../development/python-modules/pygobject/3.36.nix {
inherit (pkgs) meson;
};
pygobject3 = callPackage ../development/python-modules/pygobject/3.nix {
inherit (pkgs) meson;
};
pygogo = callPackage ../development/python-modules/pygogo { };
@ -5819,10 +5658,7 @@ in {
pygtrie = callPackage ../development/python-modules/pygtrie { };
pyhamcrest = if isPy3k then
callPackage ../development/python-modules/pyhamcrest { }
else
callPackage ../development/python-modules/pyhamcrest/1.nix { };
pyhamcrest = callPackage ../development/python-modules/pyhamcrest { };
pyhaversion = callPackage ../development/python-modules/pyhaversion { };
@ -5894,10 +5730,7 @@ in {
pylev = callPackage ../development/python-modules/pylev { };
pylibacl = if isPy3k then
callPackage ../development/python-modules/pylibacl { }
else
callPackage ../development/python-modules/pylibacl/0.5.nix { };
pylibacl = callPackage ../development/python-modules/pylibacl { };
pylibconfig2 = callPackage ../development/python-modules/pylibconfig2 { };
@ -5919,10 +5752,7 @@ in {
pylint-flask = callPackage ../development/python-modules/pylint-flask { };
pylint = if isPy3k then
callPackage ../development/python-modules/pylint { }
else
callPackage ../development/python-modules/pylint/1.9.nix { };
pylint = callPackage ../development/python-modules/pylint { };
pylint-plugin-utils = callPackage ../development/python-modules/pylint-plugin-utils { };
@ -6422,8 +6252,7 @@ in {
pytesseract = callPackage ../development/python-modules/pytesseract { };
# pytest>=6 is too new for most packages
pytest = if isPy3k then self.pytest_6 else self.pytest_4;
pytest = self.pytest_6;
pytest_4 = callPackage
../development/python-modules/pytest/4.nix {
@ -6547,10 +6376,7 @@ in {
pytest-metadata = callPackage ../development/python-modules/pytest-metadata { };
pytest-mock = if isPy3k then
callPackage ../development/python-modules/pytest-mock { }
else
callPackage ../development/python-modules/pytest-mock/2.nix { };
pytest-mock = callPackage ../development/python-modules/pytest-mock { };
pytest-mpl = callPackage ../development/python-modules/pytest-mpl { };
@ -6591,10 +6417,7 @@ in {
pytest-rerunfailures = callPackage ../development/python-modules/pytest-rerunfailures { };
pytest-runner = self.pytestrunner; # added 2021-01-04
pytestrunner = if isPy3k then
callPackage ../development/python-modules/pytestrunner { }
else
callPackage ../development/python-modules/pytestrunner/2.nix { };
pytestrunner = callPackage ../development/python-modules/pytestrunner { };
pytest-sanic = callPackage ../development/python-modules/pytest-sanic {
sanic = self.sanic.override { doCheck = false; };
@ -7023,16 +6846,7 @@ in {
pywizlight = callPackage ../development/python-modules/pywizlight { };
pyxattr = let
pyxattr' = callPackage ../development/python-modules/pyxattr { };
pyxattr_2 = pyxattr'.overridePythonAttrs (oldAttrs: rec {
version = "0.6.1";
src = oldAttrs.src.override {
inherit version;
sha256 = "b525843f6b51036198b3b87c4773a5093d6dec57d60c18a1f269dd7059aa16e3";
};
});
in if isPy3k then pyxattr' else pyxattr_2;
pyxattr = callPackage ../development/python-modules/pyxattr { };
pyworld = callPackage ../development/python-modules/pyworld { };
@ -7046,8 +6860,6 @@ in {
pyxl3 = callPackage ../development/python-modules/pyxl3 { };
pyxml = disabledIf isPy3k (callPackage ../development/python-modules/pyxml { });
pyxnat = callPackage ../development/python-modules/pyxnat { };
pyyaml = callPackage ../development/python-modules/pyyaml { };
@ -7287,8 +7099,6 @@ in {
rfcat = callPackage ../development/python-modules/rfcat { };
rhpl = disabledIf isPy3k (callPackage ../development/python-modules/rhpl { });
rich = callPackage ../development/python-modules/rich { };
rig = callPackage ../development/python-modules/rig { };
@ -7299,9 +7109,9 @@ in {
rising = callPackage ../development/python-modules/rising { };
rivet = disabledIf (!isPy3k) (toPythonModule (pkgs.rivet.override {
rivet = toPythonModule (pkgs.rivet.override {
python3 = python;
}));
});
rjsmin = callPackage ../development/python-modules/rjsmin { };
@ -7363,25 +7173,19 @@ in {
rply = callPackage ../development/python-modules/rply { };
rpm = disabledIf (!isPy3k) (toPythonModule (pkgs.rpm.override {
rpm = toPythonModule (pkgs.rpm.override {
inherit python;
}));
});
rpmfluff = callPackage ../development/python-modules/rpmfluff { };
rpy2 = if isPy3k then
callPackage ../development/python-modules/rpy2 { }
else
callPackage ../development/python-modules/rpy2/2.nix { };
rpy2 = callPackage ../development/python-modules/rpy2 { };
rpyc = callPackage ../development/python-modules/rpyc { };
rq = callPackage ../development/python-modules/rq { };
rsa = if isPy3k then
callPackage ../development/python-modules/rsa { }
else
callPackage ../development/python-modules/rsa/4_0.nix { };
rsa = callPackage ../development/python-modules/rsa { };
rtmidi-python = callPackage ../development/python-modules/rtmidi-python { };
@ -7483,11 +7287,9 @@ in {
scikitimage = callPackage ../development/python-modules/scikit-image { };
scikitlearn = let args = { inherit (pkgs) gfortran glibcLocales; };
in if isPy3k then
callPackage ../development/python-modules/scikitlearn args
else
callPackage ../development/python-modules/scikitlearn/0.20.nix args;
scikitlearn = callPackage ../development/python-modules/scikitlearn {
inherit (pkgs) gfortran glibcLocales;
};
scikit-optimize = callPackage ../development/python-modules/scikit-optimize { };
@ -7515,16 +7317,7 @@ in {
disabled = !isPy3k;
});
scipy = let
scipy_ = callPackage ../development/python-modules/scipy { };
scipy_1_2 = scipy_.overridePythonAttrs (oldAttrs: rec {
version = "1.2.2";
src = oldAttrs.src.override {
inherit version;
sha256 = "a4331e0b8dab1ff75d2c67b5158a8bb9a83c799d7140094dda936d876c7cfbb1";
};
});
in if pythonOlder "3.5" then scipy_1_2 else scipy_;
scipy = callPackage ../development/python-modules/scipy { };
scour = callPackage ../development/python-modules/scour { };
@ -7548,10 +7341,7 @@ in {
sdnotify = callPackage ../development/python-modules/sdnotify { };
seaborn = if isPy3k then
callPackage ../development/python-modules/seaborn { }
else
callPackage ../development/python-modules/seaborn/0.9.1.nix { };
seaborn = callPackage ../development/python-modules/seaborn { };
seabreeze = callPackage ../development/python-modules/seabreeze { };
@ -7561,10 +7351,7 @@ in {
inherit (pkgs) secp256k1;
};
secretstorage = if isPy3k then
callPackage ../development/python-modules/secretstorage { }
else
callPackage ../development/python-modules/secretstorage/2.nix { };
secretstorage = callPackage ../development/python-modules/secretstorage { };
secure = callPackage ../development/python-modules/secure { };
@ -7600,7 +7387,7 @@ in {
seqdiag = callPackage ../development/python-modules/seqdiag { };
sequoia = disabledIf (isPyPy || !isPy3k) (toPythonModule (pkgs.sequoia.override {
sequoia = disabledIf isPyPy (toPythonModule (pkgs.sequoia.override {
pythonPackages = self;
pythonSupport = true;
}));
@ -7626,10 +7413,7 @@ in {
setuptools-rust = callPackage ../development/python-modules/setuptools-rust { };
setuptools-scm = self.setuptools_scm; # added 2021-01-04
setuptools_scm = if isPy3k then
callPackage ../development/python-modules/setuptools_scm { }
else
callPackage ../development/python-modules/setuptools_scm/2.nix { };
setuptools_scm = callPackage ../development/python-modules/setuptools_scm { };
setuptools-scm-git-archive = callPackage ../development/python-modules/setuptools-scm-git-archive { };
@ -7843,10 +7627,7 @@ in {
soundfile = callPackage ../development/python-modules/soundfile { };
soupsieve = if isPy3k then
callPackage ../development/python-modules/soupsieve { }
else
callPackage ../development/python-modules/soupsieve/1.nix { };
soupsieve = callPackage ../development/python-modules/soupsieve { };
spacy = callPackage ../development/python-modules/spacy { };
@ -7912,15 +7693,9 @@ in {
texLive = pkgs.texlive.combine { inherit (pkgs.texlive) scheme-small standalone pgfplots; };
};
sphinxcontrib-websupport = if isPy3k then
callPackage ../development/python-modules/sphinxcontrib-websupport { }
else
callPackage ../development/python-modules/sphinxcontrib-websupport/1_1.nix { };
sphinxcontrib-websupport = callPackage ../development/python-modules/sphinxcontrib-websupport { };
sphinx = if isPy3k then
callPackage ../development/python-modules/sphinx { }
else
callPackage ../development/python-modules/sphinx/2.nix { };
sphinx = callPackage ../development/python-modules/sphinx { };
sphinx-argparse = callPackage ../development/python-modules/sphinx-argparse { };
@ -8118,10 +7893,7 @@ in {
inherit (pkgs) symengine;
};
sympy = if isPy3k then
callPackage ../development/python-modules/sympy { }
else
callPackage ../development/python-modules/sympy/1_5.nix { };
sympy = callPackage ../development/python-modules/sympy { };
systemd = callPackage ../development/python-modules/systemd {
inherit (pkgs) systemd;
@ -8131,10 +7903,7 @@ in {
tableaudocumentapi = callPackage ../development/python-modules/tableaudocumentapi { };
tables = if isPy3k then
callPackage ../development/python-modules/tables { }
else
callPackage ../development/python-modules/tables/3.5.nix { };
tables = callPackage ../development/python-modules/tables { };
tablib = callPackage ../development/python-modules/tablib { };
@ -8353,9 +8122,9 @@ in {
toggl-cli = callPackage ../development/python-modules/toggl-cli { };
tokenizers = disabledIf (!isPy3k) (toPythonModule (callPackage ../development/python-modules/tokenizers { }));
tokenizers = toPythonModule (callPackage ../development/python-modules/tokenizers { });
tokenize-rt = disabledIf (!isPy3k) (toPythonModule (callPackage ../development/python-modules/tokenize-rt { }));
tokenize-rt = toPythonModule (callPackage ../development/python-modules/tokenize-rt { });
tokenlib = callPackage ../development/python-modules/tokenlib { };
@ -8365,10 +8134,7 @@ in {
tomlkit = callPackage ../development/python-modules/tomlkit { };
toolz = if isPy3k then
callPackage ../development/python-modules/toolz { }
else
callPackage ../development/python-modules/toolz/2.nix { };
toolz = callPackage ../development/python-modules/toolz { };
toonapi = callPackage ../development/python-modules/toonapi { };
@ -8380,10 +8146,7 @@ in {
torchvision = callPackage ../development/python-modules/torchvision { };
tornado = if isPy3k then
callPackage ../development/python-modules/tornado { }
else
callPackage ../development/python-modules/tornado/5.nix { };
tornado = callPackage ../development/python-modules/tornado { };
# Used by circus and grab-site, 2020-08-29
tornado_4 = callPackage ../development/python-modules/tornado/4.nix { };
@ -8407,10 +8170,7 @@ in {
trackpy = callPackage ../development/python-modules/trackpy { };
traitlets = if pythonOlder "3.7" then
callPackage ../development/python-modules/traitlets/4.nix { }
else
callPackage ../development/python-modules/traitlets { };
traitlets = callPackage ../development/python-modules/traitlets { };
traits = callPackage ../development/python-modules/traits { };
@ -8635,12 +8395,9 @@ in {
urlgrabber = callPackage ../development/python-modules/urlgrabber { };
urllib3 = if isPy3k then
callPackage ../development/python-modules/urllib3 {
pytestCheckHook = self.pytestCheckHook_6_1;
}
else
callPackage ../development/python-modules/urllib3/2.nix { };
urllib3 = callPackage ../development/python-modules/urllib3 {
pytestCheckHook = self.pytestCheckHook_6_1;
};
urwid = callPackage ../development/python-modules/urwid { };
@ -8968,7 +8725,7 @@ in {
xdot = callPackage ../development/python-modules/xdot { };
xenomapper = disabledIf (!isPy3k) (callPackage ../applications/science/biology/xenomapper { });
xenomapper = callPackage ../applications/science/biology/xenomapper { };
xgboost = callPackage ../development/python-modules/xgboost {
inherit (pkgs) xgboost;
@ -9113,9 +8870,9 @@ in {
zdaemon = callPackage ../development/python-modules/zdaemon { };
zeek = disabledIf (!isPy3k) (toPythonModule (pkgs.zeek.override {
zeek = toPythonModule (pkgs.zeek.override {
python3 = python;
})).py;
}).py;
zeep = callPackage ../development/python-modules/zeep { };

View File

@ -2,6 +2,235 @@
# of the Python 3 packages set. This way, Python 2+3 compatible
# packages can still be used.
self: super: {
self: super:
with self; with super; {
appleseed = toPythonModule (pkgs.appleseed.override { inherit (self) python; });
astroid = callPackage ../development/python-modules/astroid/1.6.nix { };
browsermob-proxy = callPackage ../development/python-modules/browsermob-proxy { };
cairocffi = callPackage ../development/python-modules/cairocffi/0_9.nix { };
cairosvg = callPackage ../development/python-modules/cairosvg/1_x.nix { };
chardet = callPackage ../development/python-modules/chardet/2.nix { };
cherrypi = callPackage ../development/python-modules/cherrypy/17.nix { };
dnspython = super.dnspython_1;
docker-py = disabled super.docker-py;
dulwich = callPackage ../development/python-modules/dulwich/0_19.nix { };
faulthandler = callPackage ../development/python-modules/faulthandler { };
feedparser = callPackage ../development/python-modules/feedparser/5.nix { };
fontforge = disabled super.fontforge;
gaia = disabledIf (isPyPy || isPy3k) (toPythonModule (pkgs.gaia.override {
pythonPackages = self;
pythonSupport = true;
})); # gaia isn't supported with python3 and it's not available from pypi
geant4 = disabled super.geant4;
geopy = callPackage ../development/python-modules/geopy/2.nix { };
# Python 2.7 support was deprecated but is still needed by weboob and duplicity
google-api-python-client = super.google-api-python-client.overridePythonAttrs (old: rec {
version = "1.7.6";
src = old.src.override {
inherit version;
sha256 = "14w5sdrp0bk9n0r2lmpqmrbf2zclpfq6q7giyahnskkfzdkb165z";
};
});
gwyddion = toPythonModule (pkgs.gwyddion.override {
pythonSupport = true;
pythonPackages = self;
});
html2text = callPackage ../development/python-modules/html2text/2018.nix { };
httpretty = callPackage ../development/python-modules/httpretty/0.nix { };
hypothesis = super.hypothesis_4;
idna = callPackage ../development/python-modules/idna/2.nix { };
imagecodecs-lite = disabled super.imagecodecs-lite;
isort = callPackage ../development/python-modules/isort/4.nix { };
jupyter_client = callPackage ../development/python-modules/jupyter_client/5.nix { };
jupyter_console = callPackage ../development/python-modules/jupyter_console/5.nix { };
keyring = callPackage ../development/python-modules/keyring/2.nix { };
kicad = disabled super.kicad;
kiwisolver = callPackage ../development/python-modules/kiwisolver/1_1.nix { };
libgpiod = disabled super.libgpiod;
libnl-python = toPythonModule (pkgs.libnl.override {
pythonSupport = true;
inherit python;
}).py;
libplist = toPythonModule (pkgs.libplist.override {
enablePython = true;
inherit python;
}).py;
libvirt = callPackage ../development/python-modules/libvirt/5.9.0.nix {
libvirt = pkgs.libvirt_5_9_0;
};
markdown = callPackage ../development/python-modules/markdown/3_1.nix { };
matplotlib = callPackage ../development/python-modules/matplotlib/2.nix {
stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv;
inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa;
};
mercurial = disabled super.mercurial;
meson = disabled super.meson;
monosat = disabled super.monosat;
more-itertools = callPackage ../development/python-modules/more-itertools/2.7.nix { };
nbformat = callPackage ../development/python-modules/nbformat/2.nix { };
networkx = callPackage ../development/python-modules/networkx/2.2.nix { };
notebook = callPackage ../development/python-modules/notebook/2.nix { };
opencv = toPythonModule (pkgs.opencv.override {
enablePython = true;
pythonPackages = self;
});
openpyxl = callPackage ../development/python-modules/openpyxl/2.nix { };
openwrt-luci-rpc = disabled super.openwrt-luci-rpc;
opt-einsum = callPackage ../development/python-modules/opt-einsum/2.nix { };
packaging = callPackage ../development/python-modules/packaging/2.nix { };
pandas = callPackage ../development/python-modules/pandas/2.nix { };
pathpy = callPackage ../development/python-modules/path.py/2.nix { };
pip = callPackage ../development/python-modules/pip/20.nix { };
postorius = disabled super.postorius;
praw = callPackage ../development/python-modules/praw/6.3.nix { };
prettytable = callPackage ../development/python-modules/prettytable/1.nix { };
prompt_toolkit = callPackage ../development/python-modules/prompt_toolkit/1.nix { };
pycangjie = disabled pycangjie;
pydns = callPackage ../development/python-modules/pydns { };
pydocstyle = callPackage ../development/python-modules/pydocstyle/2.nix { };
pyexiv2 = toPythonModule (callPackage ../development/python-modules/pyexiv2 { });
pygments = callPackage ../development/python-modules/Pygments/2_5.nix { };
pygobject3 = callPackage ../development/python-modules/pygobject/3.36.nix {
inherit (pkgs) meson;
};
pyhamcrest = callPackage ../development/python-modules/pyhamcrest/1.nix { };
pylibacl = callPackage ../development/python-modules/pylibacl/0.5.nix { };
pylint = callPackage ../development/python-modules/pylint/1.9.nix { };
pytest = pytest_4;
pytest-mock = callPackage ../development/python-modules/pytest-mock/2.nix { };
pytestrunner = callPackage ../development/python-modules/pytestrunner/2.nix { };
pyxattr = super.pyxattr.overridePythonAttrs (oldAttrs: rec {
version = "0.6.1";
src = oldAttrs.src.override {
inherit version;
sha256 = "b525843f6b51036198b3b87c4773a5093d6dec57d60c18a1f269dd7059aa16e3";
};
});
pyxml = callPackage ../development/python-modules/pyxml { };
rhpl = callPackage ../development/python-modules/rhpl { };
rivet = disabled super.rivet;
rpm = disabled super.rpm;
rpy2 = callPackage ../development/python-modules/rpy2/2.nix { };
rsa = callPackage ../development/python-modules/rsa/4_0.nix { };
scikitlearn = callPackage ../development/python-modules/scikitlearn/0.20.nix {
inherit (pkgs) gfortran glibcLocales;
};
scipy = super.scipy.overridePythonAttrs (oldAttrs: rec {
version = "1.2.2";
src = oldAttrs.src.override {
inherit version;
sha256 = "a4331e0b8dab1ff75d2c67b5158a8bb9a83c799d7140094dda936d876c7cfbb1";
};
});
seaborn = callPackage ../development/python-modules/seaborn/0.9.1.nix { };
secretstorage = callPackage ../development/python-modules/secretstorage/2.nix { };
sequoia = disabled super.sequoia;
setuptools_scm = callPackage ../development/python-modules/setuptools_scm/2.nix { };
soupsieve = callPackage ../development/python-modules/soupsieve/1.nix { };
sphinxcontrib-websupport = callPackage ../development/python-modules/sphinxcontrib-websupport/1_1.nix { };
sphinx = callPackage ../development/python-modules/sphinx/2.nix { };
sympy = callPackage ../development/python-modules/sympy/1_5.nix { };
tables = callPackage ../development/python-modules/tables/3.5.nix { };
tokenizers = disabled super.tokenizers;
tokenize-rt = disabled super.tokenize-rt;
toolz = callPackage ../development/python-modules/toolz/2.nix { };
tornado = callPackage ../development/python-modules/tornado/5.nix { };
traitlets = callPackage ../development/python-modules/traitlets/4.nix { };
urllib3 = callPackage ../development/python-modules/urllib3/2.nix { };
xenomapper = disabled super.xenomapper;
zeek = disablede super.zeek;
}