diff options
author | adisbladis <adisbladis@gmail.com> | 2021-02-11 14:20:17 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-11 14:20:17 +0100 |
commit | 4dae2acb8018bc5998ee2292999c847fdad403d1 (patch) | |
tree | 0729b5de200085df12618ad4d6cdc68334b82ece | |
parent | af041ddbc0ba39fe19e69f00c856dec012b2e0ed (diff) | |
parent | 1ba244258d0c7f5ef08cbbaf764599c8ddbd927b (diff) |
Merge pull request #112770 from tweag/poetry2nix-1_15_4
poetry2nix: 1.15.3 -> 1.15.4
-rw-r--r-- | pkgs/development/tools/poetry2nix/poetry2nix/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix | 19 |
2 files changed, 20 insertions, 1 deletions
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix index f6dd768a06d35..47c3e26fa6ad4 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix @@ -71,7 +71,7 @@ in lib.makeScope pkgs.newScope (self: { # Poetry2nix version - version = "1.15.3"; + version = "1.15.4"; /* Returns a package of editable sources whose changes will be available without needing to restart the nix-shell. diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index c0af7a51f52ce..9ee690815faf0 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -81,6 +81,10 @@ self: super: } ); + celery = super.celery.overridePythonAttrs (old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.setuptools ]; + }); + cssselect2 = super.cssselect2.overridePythonAttrs ( old: { buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; @@ -135,6 +139,12 @@ self: super: } ); + daphne = super.daphne.overridePythonAttrs (old: { + postPatch = '' + substituteInPlace setup.py --replace 'setup_requires=["pytest-runner"],' "" + ''; + }); + datadog-lambda = super.datadog-lambda.overridePythonAttrs (old: { postPatch = '' substituteInPlace setup.py --replace "setuptools==" "setuptools>=" @@ -142,6 +152,10 @@ self: super: buildInputs = (old.buildInputs or [ ]) ++ [ self.setuptools ]; }); + dcli = super.dcli.overridePythonAttrs (old: { + propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ]; + }); + ddtrace = super.ddtrace.overridePythonAttrs (old: { buildInputs = (old.buildInputs or [ ]) ++ (pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.darwin.IOKit ]) ++ [ self.cython ]; @@ -364,6 +378,11 @@ self: super: } ); + jsonslicer = super.jsonslicer.overridePythonAttrs (old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; + buildInputs = old.buildInputs ++ [ pkgs.yajl ]; + }); + jupyter = super.jupyter.overridePythonAttrs ( old: rec { # jupyter is a meta-package. Everything relevant comes from the |