Merge pull request #788 from SemMulder/add-overrides

Add overrides

overrides/build-systems.json

@@ -167,6 +167,9 @@
   "aio-georss-gdacs": [
     "setuptools"
   ],
+  "aio-pika": [
+    "setuptools"
+  ],
   "aioairq": [
     "setuptools"
   ],
@@ -444,6 +447,9 @@
     "poetry-core",
     "setuptools"
   ],
+  "aiormq": [
+    "setuptools"
+  ],
   "aiorpcx": [
     "setuptools"
   ],
@@ -3710,6 +3716,9 @@
   "django-colorful": [
     "setuptools"
   ],
+  "django-colorfield": [
+    "setuptools"
+  ],
   "django-compat": [
     "setuptools"
   ],
@@ -3944,6 +3953,9 @@
     "setuptools",
     "setuptools-scm"
   ],
+  "djangorestframework-stubs": [
+    "setuptools"
+  ],
   "djmail": [
     "setuptools"
   ],
@@ -4571,6 +4583,7 @@
     "flit-core",
     "flit-scm",
     "flitBuildHook",
+    "flit-scm",
     "setuptools"
   ],
   "exchangelib": [
@@ -8304,6 +8317,9 @@
   "migen": [
     "setuptools"
   ],
+  "migra": [
+    "poetry-core"
+  ],
   "mike": [
     "setuptools"
   ],
@@ -14699,6 +14715,9 @@
   "schema": [
     "setuptools"
   ],
+  "schemainspect": [
+    "setuptools"
+  ],
   "schema-salad": [
     "setuptools"
   ],
@@ -15670,6 +15689,9 @@
   "sqlalchemy-utils": [
     "setuptools"
   ],
+  "sqlbag": [
+    "setuptools"
+  ],
   "sqlglot": [
     "setuptools"
   ],
@@ -16695,6 +16717,9 @@
   "tunigo": [
     "setuptools"
   ],
+  "tusker": [
+    "poetry"
+  ],
   "turnt": [
     "flitBuildHook",
     "setuptools"
@@ -16849,6 +16874,9 @@
   "types-jsonschema": [
     "setuptools"
   ],
+  "types-markdown": [
+    "setuptools"
+  ],
   "types-protobuf": [
     "setuptools"
   ],

overrides/default.nix

@@ -1319,10 +1319,26 @@ lib.composeManyExtensions [
       );
 
       open3d = super.open3d.overridePythonAttrs (old: {
+        propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.ipywidgets ];
         buildInputs = (old.buildInputs or [ ]) ++ [
           pkgs.udev
           pkgs.libusb1
-        ];
+        ] ++ (if lib.versionAtLeast super.open3d.version "0.16.0" then [
+          pkgs.mesa
+          (
+            pkgs.symlinkJoin {
+              name = "llvm-with-ubuntu-compatible-symlink";
+              paths = [
+                pkgs.llvm_10.lib
+                (pkgs.runCommand "llvm-ubuntu-compatible-symlink" { }
+                  ''
+                    mkdir -p "$out/lib/";
+                    ln -s "${pkgs.llvm_10.lib}/lib/libLLVM-10.so" "$out/lib/libLLVM-10.so.1"
+                  ''
+                )
+              ];
+            })
+        ] else [ ]);
         # TODO(Sem Mulder): Add overridable flags for CUDA/PyTorch/Tensorflow support.
         autoPatchelfIgnoreMissingDeps = true;
       });