diff options
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 23 |
2 files changed, 20 insertions, 5 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ce73a1477a73..f6543872561c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -546,6 +546,8 @@ in wrapGAppsHook = callPackage ../build-support/setup-hooks/wrap-gapps-hook { }; + wrapGAppsNoGuiHook = wrapGAppsHook.override { isGraphical = false; }; + separateDebugInfo = makeSetupHook { } ../build-support/setup-hooks/separate-debug-info.sh; setupDebugInfoDirs = makeSetupHook { } ../build-support/setup-hooks/setup-debug-info-dirs.sh; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index aa3a001a8210..8e68f3b97939 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2270,7 +2270,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 { }; @@ -3058,7 +3061,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 { }; @@ -3229,6 +3236,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; }; @@ -4346,7 +4355,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 { }; @@ -5636,7 +5647,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 @@ -5808,7 +5819,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 { }; @@ -6227,6 +6238,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 { }; |