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

overrides: Assorted fixes

overrides/build-systems.json

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

overrides/default.nix

@@ -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: {
         propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ];
       });