poetry2nix: 1.20.0 -> 1.21.0
(cherry picked from commit c779050edb56f5958d28af7aec444c14f6a18163)
This commit is contained in:
parent
20e9966c78
commit
44999232a9
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
];
|
||||
}
|
||||
);
|
||||
|
|
Loading…
Reference in New Issue