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

Merge pull request #105584 from NixOS/staging-next

Browse Source 
Staging next
This commit is contained in:
Frederik Rietdijk
2020-12-06 11:48:51 +01:00
committed by GitHub
parent 46f7fbd5fc 01bb2154bb
commit b6e98f1895
401 changed files with 1961 additions and 972 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/python-packages.nix
+18 -5
View File
@@ -2274,7 +2274,10 @@ in {
freetype-py = callPackage ../development/python-modules/freetype-py { };
freezegun = callPackage ../development/python-modules/freezegun { };
freezegun = if isPy27 then
callPackage ../development/python-modules/freezegun/0.3.nix { }
else
callPackage ../development/python-modules/freezegun { };
fritzconnection = callPackage ../development/python-modules/fritzconnection { };
@@ -3062,7 +3065,11 @@ in {
isodate = callPackage ../development/python-modules/isodate { };
isort = callPackage ../development/python-modules/isort { };
isort = if isPy3k then
callPackage ../development/python-modules/isort { }
else
callPackage ../development/python-modules/isort/4.nix {
};
isoweek = callPackage ../development/python-modules/isoweek { };
@@ -3233,6 +3240,8 @@ in {
jupyterlab_launcher = callPackage ../development/python-modules/jupyterlab_launcher { };
jupyterlab-pygments = callPackage ../development/python-modules/jupyterlab-pygments { };
jupyterlab_server = callPackage ../development/python-modules/jupyterlab_server { };
jupyter-repo2docker = callPackage ../development/python-modules/jupyter-repo2docker { pkgs-docker = pkgs.docker; };
@@ -4352,7 +4361,9 @@ in {
oyaml = callPackage ../development/python-modules/oyaml { };
packaging = callPackage ../development/python-modules/packaging { };
packaging = if isPy3k
then callPackage ../development/python-modules/packaging { }
else callPackage ../development/python-modules/packaging/2.nix { };
packet-python = callPackage ../development/python-modules/packet-python { };
@@ -5644,7 +5655,7 @@ in {
pytesseract = callPackage ../development/python-modules/pytesseract { };
# pytest>=6 is too new for most packages
pytest = if isPy3k then self.pytest_5 else self.pytest_4;
pytest = if isPy3k then self.pytest_6 else self.pytest_4;
pytest_4 = callPackage
../development/python-modules/pytest/4.nix { # hypothesis tests require pytest that causes dependency cycle
@@ -5816,7 +5827,7 @@ in {
pytest_xdist_2 = callPackage ../development/python-modules/pytest-xdist/2.nix { };
pytest_xdist = self.pytest_xdist_1;
pytest_xdist = self.pytest_xdist_2;
pytest-xprocess = callPackage ../development/python-modules/pytest-xprocess { };
@@ -6235,6 +6246,8 @@ in {
rdflib-jsonld = callPackage ../development/python-modules/rdflib-jsonld { };
re-assert = callPackage ../development/python-modules/re-assert { };
readchar = callPackage ../development/python-modules/readchar { };
readme = callPackage ../development/python-modules/readme { };