NixOS · ajs124 · Jan 1, 2023 · Dec 10, 2022
@@ -5,7 +5,7 @@
 }:
 let
   # Poetry2nix version
-  version = "1.38.0";
+  version = "1.39.1";
 
   inherit (poetryLib) isCompatible readTOML normalizePackageName normalizePackageSet;
 

@@ -165,6 +165,7 @@ pythonPackages.callPackage
           (
             builtins.fetchGit ({
               inherit (source) url;
+              submodules = true;
               rev = source.resolved_reference or source.reference;
               ref = sourceSpec.branch or (if sourceSpec ? tag then "refs/tags/${sourceSpec.tag}" else "HEAD");
             } // (

@@ -2938,6 +2938,9 @@
   "cometblue-lite": [
     "setuptools"
   ],
+  "comm": [
+    "hatchling"
+  ],
   "commandparse": [
     "setuptools"
   ],
@@ -9892,7 +9895,8 @@
     "setuptools"
   ],
   "packaging": [
-    "setuptools"
+    "setuptools",
+    "flit-core"
   ],
   "packbits": [
     "setuptools"
@@ -14254,7 +14258,9 @@
     "setuptools"
   ],
   "rapidfuzz": [
-    "setuptools"
+    "setuptools",
+    "packaging",
+    "scikit-build"
   ],
   "rapidfuzz-capi": [
     "setuptools"
@@ -14949,7 +14955,8 @@
     "setuptools-scm"
   ],
   "scikit-image": [
-    "cython"
+    "cython",
+    "setuptools"
   ],
   "scikit-learn": [
     "cython",
@@ -16893,6 +16900,9 @@
   "trimesh": [
     "setuptools"
   ],
+  "trino": [
+    "setuptools"
+  ],
   "trio": [
     "setuptools"
   ],
@@ -16905,6 +16915,10 @@
   "troposphere": [
     "setuptools"
   ],
+  "trove-classifiers": [
+    "setuptools",
+    "calver"
+  ],
   "trueskill": [
     "setuptools"
   ],

@@ -390,7 +390,7 @@ lib.composeManyExtensions [
           scrypto =
             if isWheel then
               (
-                super.cryptography.override { preferWheel = true; }
+                super.cryptography.overridePythonAttrs { preferWheel = true; }
               ) else super.cryptography;
         in
         scrypto.overridePythonAttrs
@@ -1324,9 +1324,10 @@ 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 [
+        ] ++ lib.optionals stdenv.isLinux [
+          pkgs.udev
+        ] ++ lib.optionals (lib.versionAtLeast super.open3d.version "0.16.0") [
           pkgs.mesa
           (
             pkgs.symlinkJoin {
@@ -1341,29 +1342,43 @@ lib.composeManyExtensions [
                 )
               ];
             })
-        ] else [ ]);
+        ];
+
+        # Patch the dylib in the binary distribution to point to the nix build of libomp
+        preFixup = lib.optionalString (stdenv.isDarwin && lib.versionAtLeast super.open3d.version "0.16.0") ''
+          install_name_tool -change /opt/homebrew/opt/libomp/lib/libomp.dylib ${pkgs.llvmPackages.openmp}/lib/libomp.dylib $out/lib/python*/site-packages/open3d/cpu/pybind.cpython-*-darwin.so
+        '';
+
         # TODO(Sem Mulder): Add overridable flags for CUDA/PyTorch/Tensorflow support.
         autoPatchelfIgnoreMissingDeps = true;
       });
 
+      # Overrides for building packages based on OpenCV
+      # These flags are inspired by the opencv 4.x package in nixpkgs
       _opencv-python-override =
         old: {
+          # Disable OpenCL on macOS
+          # Can't use cmakeFlags because cmake is called by setup.py
+          CMAKE_ARGS = lib.optionalString stdenv.isDarwin "-DWITH_OPENCL=OFF";
+
           nativeBuildInputs = [ pkgs.cmake ] ++ old.nativeBuildInputs;
-          buildInputs = [ self.scikit-build ] ++ (old.buildInputs or [ ]);
+          buildInputs = [
+            self.scikit-build
+          ] ++ lib.optionals stdenv.isDarwin (with pkgs.darwin.apple_sdk.frameworks; [
+            AVFoundation
+            Cocoa
+            CoreMedia
+            MediaToolbox
+            VideoDecodeAcceleration
+          ]) ++ (old.buildInputs or [ ]);
           dontUseCmakeConfigure = true;
         };
 
       opencv-python = super.opencv-python.overridePythonAttrs self._opencv-python-override;
 
       opencv-python-headless = super.opencv-python.overridePythonAttrs self._opencv-python-override;
 
-      opencv-contrib-python = super.opencv-contrib-python.overridePythonAttrs (
-        old: {
-          nativeBuildInputs = [ pkgs.cmake ] ++ old.nativeBuildInputs;
-          buildInputs = [ self.scikit-build ] ++ (old.buildInputs or [ ]);
-          dontUseCmakeConfigure = true;
-        }
-      );
+      opencv-contrib-python = super.opencv-contrib-python.overridePythonAttrs self._opencv-python-override;
 
       openexr = super.openexr.overridePythonAttrs (
         old: {
@@ -1775,6 +1790,13 @@ lib.composeManyExtensions [
           ++ [ pkgs.freetds ];
       });
 
+      pyopencl = super.pyopencl.overridePythonAttrs (
+        old: {
+          nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.numpy ];
+          propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ pkgs.ocl-icd pkgs.opencl-headers ];
+        }
+      );
+
       pyopenssl = super.pyopenssl.overridePythonAttrs (
         old: {
           buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.openssl ];
@@ -2705,6 +2727,10 @@ lib.composeManyExtensions [
             'if True:'
         '';
       });
+
+      mkdocs = super.mkdocs.overridePythonAttrs (old: {
+        propagatedBuildInputs = old.propagatedBuildInputs or [ ] ++ [ self.babel ];
+      });
     }
   )
 

@@ -52,8 +52,5 @@ poetry2nix.mkPoetryApplication {
   meta = with lib; {
     inherit (python.meta) platforms;
     maintainers = with maintainers; [ adisbladis jakewaksbaum ];
-    knownVulnerabilities = [
-      "CVE-2022-42966"  # cleo version in poetry.lock is vulnerable
-    ];
   };
 }