diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-10-27 16:08:27 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-10-27 16:26:58 +0100 |
| commit | 21177d3e935b52d08df9108cb25601ee453966ae (patch) | |
| tree | af4855a343bcca3ab65105cbcc1f11342543be57 /pkgs/development/python-modules/poetry | |
| parent | befc2dfa82f864cf44fa5798e39a6dd85fef2b8e (diff) | |
| download | nixpkgs-21177d3e935b52d08df9108cb25601ee453966ae.tar nixpkgs-21177d3e935b52d08df9108cb25601ee453966ae.tar.gz nixpkgs-21177d3e935b52d08df9108cb25601ee453966ae.tar.bz2 nixpkgs-21177d3e935b52d08df9108cb25601ee453966ae.tar.lz nixpkgs-21177d3e935b52d08df9108cb25601ee453966ae.tar.xz nixpkgs-21177d3e935b52d08df9108cb25601ee453966ae.tar.zst nixpkgs-21177d3e935b52d08df9108cb25601ee453966ae.zip | |
python3.pkgs.poetry: fixup
Diffstat (limited to 'pkgs/development/python-modules/poetry')
| -rw-r--r-- | pkgs/development/python-modules/poetry/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/python-modules/poetry/jsonschema.nix | 37 |
2 files changed, 4 insertions, 41 deletions
diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix index 52be2c3bafc..d31fe236f82 100644 --- a/pkgs/development/python-modules/poetry/default.nix +++ b/pkgs/development/python-modules/poetry/default.nix @@ -17,10 +17,11 @@ , virtualenv , functools32 , pytest +, jsonschema }: let - cleo6 = cleo.overrideAttrs (oldAttrs: rec { + cleo6 = cleo.overridePythonAttrs (oldAttrs: rec { version = "0.6.8"; src = fetchPypi { inherit (oldAttrs) pname; @@ -28,8 +29,6 @@ let sha256 = "06zp695hq835rkaq6irr1ds1dp2qfzyf32v60vxpd8rcnxv319l5"; }; }); - - jsonschema3 = callPackage ./jsonschema.nix { }; glob2 = callPackage ./glob2.nix { }; in buildPythonPackage rec { @@ -51,11 +50,12 @@ in buildPythonPackage rec { format = "pyproject"; propagatedBuildInputs = [ + cachy cleo6 requests cachy requests-toolbelt - jsonschema3 + jsonschema pyrsistent pyparsing cachecontrol diff --git a/pkgs/development/python-modules/poetry/jsonschema.nix b/pkgs/development/python-modules/poetry/jsonschema.nix deleted file mode 100644 index f85477d04fa..00000000000 --- a/pkgs/development/python-modules/poetry/jsonschema.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 -, attrs -, pyrsistent -, six -, functools32 -, lockfile -, setuptools_scm -}: - -buildPythonPackage rec { - pname = "jsonschema"; - version = "3.0.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "8d4a2b7b6c2237e0199c8ea1a6d3e05bf118e289ae2b9d7ba444182a2959560d"; - }; - - nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ - attrs - pyrsistent - six - lockfile - ] ++ lib.optional isPy27 functools32; - - # tests for latest version rely on custom version of betterpaths that is - # difficult to deal with and isn't used on master - doCheck = false; - - meta = with lib; { - homepage = https://github.com/Julian/jsonschema; - description = "An implementation of JSON Schema validation for Python"; - license = licenses.mit; - maintainers = with maintainers; [ jakewaksbaum ]; - }; -} |