diff options
| author | adisbladis <adisbladis@gmail.com> | 2021-09-29 21:35:44 -0500 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2021-09-30 03:09:34 +0000 |
| commit | 44999232a974132e4c4623ae67f856154b330dff (patch) | |
| tree | 2ef01fd350e7886ebaae4011d9dbb5308a948d6f | |
| parent | Merge pull request #139924 from NixOS/backport-132650-to-release-21.05 (diff) | |
| download | nixpkgs-origin/backport-139987-to-release-21.05.tar.gz | |
poetry2nix: 1.20.0 -> 1.21.0origin/backport-139987-to-release-21.05
(cherry picked from commit c779050edb56f5958d28af7aec444c14f6a18163)
| -rw-r--r-- | pkgs/development/tools/poetry2nix/poetry2nix/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix | 7 |
2 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix index 22ab12149285..dae0a02b6175 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix @@ -5,7 +5,7 @@ }: let # Poetry2nix version - version = "1.20.0"; + version = "1.21.0"; inherit (poetryLib) isCompatible readTOML moduleName; @@ -339,6 +339,9 @@ lib.makeScope pkgs.newScope (self: { ) { inherit app; }; }; + # Extract position from explicitly passed attrs so meta.position won't point to poetry2nix internals + pos = builtins.unsafeGetAttrPos (lib.elemAt (lib.attrNames attrs) 0) attrs; + meta = lib.optionalAttrs (lib.hasAttr "description" pyProject.tool.poetry) { inherit (pyProject.tool.poetry) description; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index daf536561f11..ab1a5324c98e 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -156,6 +156,12 @@ self: super: } ); + cheroot = super.cheroot.overridePythonAttrs ( + old: { + dontPreferSetupPy = true; + } + ); + colour = super.colour.overridePythonAttrs ( old: { buildInputs = (old.buildInputs or [ ]) ++ [ self.d2to1 ]; @@ -547,6 +553,7 @@ self: super: self.pytestrunner self.cryptography self.pyjwt + self.setuptools-scm-git-archive ]; } ); |