public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #139994 from NixOS/backport-139987-to-release-21.05

Browse Source 
[Backport release-21.05] poetry2nix: 1.20.0 -> 1.21.0
This commit is contained in:
adisbladis 2021-09-29 22:24:26 -05:00 committed by GitHub
commit 182eea7232
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/tools/poetry2nix/poetry2nix/default.nix
View File

@ -5,7 +5,7 @@
}: }:
let let
# Poetry2nix version # Poetry2nix version
version = "1.20.0"; version = "1.21.0";
inherit (poetryLib) isCompatible readTOML moduleName; inherit (poetryLib) isCompatible readTOML moduleName;
@ -339,6 +339,9 @@ lib.makeScope pkgs.newScope (self: {
) { inherit app; }; ) { 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) meta = lib.optionalAttrs (lib.hasAttr "description" pyProject.tool.poetry)
{ {
inherit (pyProject.tool.poetry) description; inherit (pyProject.tool.poetry) description;

7
pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
View File

@ -156,6 +156,12 @@ self: super:
} }
); );
cheroot = super.cheroot.overridePythonAttrs (
old: {
dontPreferSetupPy = true;
}
);
colour = super.colour.overridePythonAttrs ( colour = super.colour.overridePythonAttrs (
old: { old: {
buildInputs = (old.buildInputs or [ ]) ++ [ self.d2to1 ]; buildInputs = (old.buildInputs or [ ]) ++ [ self.d2to1 ];
@ -547,6 +553,7 @@ self: super:
self.pytestrunner self.pytestrunner
self.cryptography self.cryptography
self.pyjwt self.pyjwt
self.setuptools-scm-git-archive
]; ];
} }
); );