Merge pull request #530 from nix-community/assorted-fixes-2022-01-23

overrides: Assorted fixes
This commit is contained in:
adisbladis 2022-01-23 11:23:37 +12:00 committed by GitHub
commit b37a389df4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 0 deletions

View file

@ -665,6 +665,9 @@
"ptyprocess": [ "ptyprocess": [
"flit-core" "flit-core"
], ],
"publication": [
"flit"
],
"purepng": [ "purepng": [
"cython" "cython"
], ],
@ -1044,6 +1047,9 @@
"simplisafe-python": [ "simplisafe-python": [
"poetry-core" "poetry-core"
], ],
"single-source": [
"poetry-core"
],
"slowapi": [ "slowapi": [
"poetry-core" "poetry-core"
], ],
@ -1179,6 +1185,9 @@
"toggl-cli": [ "toggl-cli": [
"pbr" "pbr"
], ],
"toml-sort": [
"poetry"
],
"tomli": [ "tomli": [
"flit-core" "flit-core"
], ],
@ -1203,6 +1212,9 @@
"twentemilieu": [ "twentemilieu": [
"poetry-core" "poetry-core"
], ],
"typer": [
"flit-core"
],
"typical": [ "typical": [
"poetry-core" "poetry-core"
], ],

View file

@ -174,6 +174,20 @@ lib.composeManyExtensions [
} }
); );
cattrs =
let
drv = super.cattrs;
in
if drv.version == "1.10.0" then
drv.overridePythonAttrs
(old: {
# 1.10.0 contains a pyproject.toml that requires a pre-release Poetry
# We can avoid using Poetry and use the generated setup.py
preConfigure = old.preConfigure or "" + ''
rm pyproject.toml
'';
}) else drv;
celery = super.celery.overridePythonAttrs (old: { celery = super.celery.overridePythonAttrs (old: {
propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ]; propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ];
}); });