diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-22 06:01:44 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-22 06:01:44 +0000 |
| commit | 2e00ed442014f6e095fb20cc1daec82c2a19b03e (patch) | |
| tree | adfdbfcd5efa1d42cc1f544b4dbb015d2e096c51 /pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix | |
| parent | 5870dfba88f173dc1e5487483ba0477dedc0ca45 (diff) | |
| parent | 5990961c7295ac966899882990325abb8fa555fd (diff) | |
| download | nixpkgs-2e00ed442014f6e095fb20cc1daec82c2a19b03e.tar nixpkgs-2e00ed442014f6e095fb20cc1daec82c2a19b03e.tar.gz nixpkgs-2e00ed442014f6e095fb20cc1daec82c2a19b03e.tar.bz2 nixpkgs-2e00ed442014f6e095fb20cc1daec82c2a19b03e.tar.lz nixpkgs-2e00ed442014f6e095fb20cc1daec82c2a19b03e.tar.xz nixpkgs-2e00ed442014f6e095fb20cc1daec82c2a19b03e.tar.zst nixpkgs-2e00ed442014f6e095fb20cc1daec82c2a19b03e.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix')
| -rw-r--r-- | pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index 78751385577..58a634ee86c 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -499,7 +499,7 @@ self: super: old: { inherit (pkgs.python3Packages.jira) patches; buildInputs = (old.buildInputs or [ ]) ++ [ - self.pytestrunner + self.pytest-runner self.cryptography self.pyjwt ]; @@ -1269,8 +1269,6 @@ self: super: } ); - pytest-runner = super.pytest-runner or super.pytestrunner; - pytest-pylint = super.pytest-pylint.overridePythonAttrs ( old: { buildInputs = [ self.pytest-runner ]; |