diff options
Diffstat (limited to 'nixpkgs/pkgs/top-level/python-packages.nix')
-rw-r--r-- | nixpkgs/pkgs/top-level/python-packages.nix | 36 |
1 files changed, 13 insertions, 23 deletions
diff --git a/nixpkgs/pkgs/top-level/python-packages.nix b/nixpkgs/pkgs/top-level/python-packages.nix index 2ec132264a99..f82f7c04b5ba 100644 --- a/nixpkgs/pkgs/top-level/python-packages.nix +++ b/nixpkgs/pkgs/top-level/python-packages.nix @@ -18,7 +18,7 @@ let packages = ( self: let - inherit (python.passthru) isPy27 isPy33 isPy34 isPy35 isPy36 isPy37 isPy3k isPyPy pythonAtLeast pythonOlder; + inherit (python.passthru) isPy27 isPy33 isPy34 isPy35 isPy36 isPy37 isPy38 isPy3k isPyPy pythonAtLeast pythonOlder; callPackage = pkgs.newScope self; @@ -58,23 +58,7 @@ let # See build-setupcfg/default.nix for documentation. buildSetupcfg = import ../build-support/build-setupcfg self; - fetchPypi = makeOverridable( {format ? "setuptools", ... } @attrs: - let - fetchWheel = {pname, version, sha256, python ? "py2.py3", abi ? "none", platform ? "any"}: - # Fetch a wheel. By default we fetch an universal wheel. - # See https://www.python.org/dev/peps/pep-0427/#file-name-convention for details regarding the optional arguments. - let - url = "https://files.pythonhosted.org/packages/${python}/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}-${python}-${abi}-${platform}.whl"; - in pkgs.fetchurl {inherit url sha256;}; - fetchSource = {pname, version, sha256, extension ? "tar.gz"}: - # Fetch a source tarball. - let - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.${extension}"; - in pkgs.fetchurl {inherit url sha256;}; - fetcher = (if format == "wheel" then fetchWheel - else if format == "setuptools" then fetchSource - else throw "Unsupported kind ${kind}"); - in fetcher (builtins.removeAttrs attrs ["format"]) ); + fetchPypi = callPackage ../development/interpreters/python/fetchpypi.nix {}; # Check whether a derivation provides a Python module. hasPythonModule = drv: drv?pythonModule && drv.pythonModule == python; @@ -644,8 +628,6 @@ in { pims = callPackage ../development/python-modules/pims { }; - plantuml = callPackage ../tools/misc/plantuml { }; - poetry = callPackage ../development/python-modules/poetry { }; pplpy = callPackage ../development/python-modules/pplpy { }; @@ -835,6 +817,8 @@ in { slurm = pkgs.slurm; }; + pysmf = callPackage ../development/python-modules/pysmf { }; + pyspinel = callPackage ../development/python-modules/pyspinel {}; pyssim = callPackage ../development/python-modules/pyssim { }; @@ -1104,6 +1088,8 @@ in { aniso8601 = callPackage ../development/python-modules/aniso8601 {}; + anonip = callPackage ../development/python-modules/anonip { }; + asgiref = callPackage ../development/python-modules/asgiref { }; python-editor = callPackage ../development/python-modules/python-editor { }; @@ -1647,10 +1633,10 @@ in { openant = callPackage ../development/python-modules/openant { }; - opencv = toPythonModule (pkgs.opencv.override { + opencv = disabledIf isPy3k (toPythonModule (pkgs.opencv.override { enablePython = true; pythonPackages = self; - }); + })); opencv3 = toPythonModule (pkgs.opencv3.override { enablePython = true; @@ -4874,7 +4860,9 @@ in { sphinxcontrib_newsfeed = callPackage ../development/python-modules/sphinxcontrib_newsfeed { }; - sphinxcontrib_plantuml = callPackage ../development/python-modules/sphinxcontrib_plantuml { }; + sphinxcontrib_plantuml = callPackage ../development/python-modules/sphinxcontrib_plantuml { + inherit (pkgs) plantuml; + }; sphinxcontrib-spelling = callPackage ../development/python-modules/sphinxcontrib-spelling { }; @@ -4898,6 +4886,8 @@ in { svgwrite = callPackage ../development/python-modules/svgwrite { }; + swagger-spec-validator = callPackage ../development/python-modules/swagger-spec-validator { }; + freezegun = callPackage ../development/python-modules/freezegun { }; taskw = callPackage ../development/python-modules/taskw { }; |