From c8e951119a8637ca17e1a32b515144d9acce0e9a Mon Sep 17 00:00:00 2001 From: Sem Mulder Date: Mon, 31 Oct 2022 13:21:57 +0100 Subject: [PATCH 1/2] Add build systems --- overrides/build-systems.json | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/overrides/build-systems.json b/overrides/build-systems.json index e2e674d..ddd09f7 100644 --- a/overrides/build-systems.json +++ b/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" ], @@ -3707,6 +3713,9 @@ "django-colorful": [ "setuptools" ], + "django-colorfield": [ + "setuptools" + ], "django-compat": [ "setuptools" ], @@ -3941,6 +3950,9 @@ "setuptools", "setuptools-scm" ], + "djangorestframework-stubs": [ + "setuptools" + ], "djmail": [ "setuptools" ], @@ -4567,6 +4579,7 @@ "exceptiongroup": [ "flit-core", "flitBuildHook", + "flit-scm", "setuptools" ], "exchangelib": [ @@ -8290,6 +8303,9 @@ "migen": [ "setuptools" ], + "migra": [ + "poetry-core" + ], "mike": [ "setuptools" ], @@ -14675,6 +14691,9 @@ "schema": [ "setuptools" ], + "schemainspect": [ + "setuptools" + ], "schema-salad": [ "setuptools" ], @@ -15643,6 +15662,9 @@ "sqlalchemy-utils": [ "setuptools" ], + "sqlbag": [ + "setuptools" + ], "sqlglot": [ "setuptools" ], @@ -16662,6 +16684,9 @@ "tunigo": [ "setuptools" ], + "tusker": [ + "poetry" + ], "turnt": [ "flitBuildHook", "setuptools" @@ -16816,6 +16841,9 @@ "types-jsonschema": [ "setuptools" ], + "types-markdown": [ + "setuptools" + ], "types-protobuf": [ "setuptools" ], From 3813345e0b17f96cd7526efb5e836ffbf23ef4b1 Mon Sep 17 00:00:00 2001 From: Sem Mulder Date: Mon, 31 Oct 2022 14:19:09 +0100 Subject: [PATCH 2/2] Fix Open3D 0.16.0 --- overrides/default.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/overrides/default.nix b/overrides/default.nix index 90533ef..f0bd29f 100644 --- a/overrides/default.nix +++ b/overrides/default.nix @@ -1303,10 +1303,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; });