From 2391076a095589e0c8ba000a7c7bed116943be93 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 6 Jun 2025 20:10:15 +0200 Subject: [PATCH 1/2] python3Packages.trimesh: 4.6.10 -> 4.6.11 Changelog: https://github.com/mikedh/trimesh/releases/tag/4.6.11 --- pkgs/development/python-modules/trimesh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 34b53e868a5d..ca10acae803b 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "trimesh"; - version = "4.6.10"; + version = "4.6.11"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mikedh"; repo = "trimesh"; tag = version; - hash = "sha256-tlIsRZLmnRCqVHcLQOh6Jmne3rZGS95QudnvJHMu1qs="; + hash = "sha256-wltoJsfHl5qtceG96oT5yqLiJl0zeX9IOw+eeKXfJb0="; }; build-system = [ setuptools ]; From cfe192376afe975f0b986cbf5c75c6c109f3b984 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 9 Jun 2025 04:30:03 +0200 Subject: [PATCH 2/2] python3Packages.trimesh: remove 'with python3.pkgs;' --- .../python-modules/trimesh/default.nix | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index ca10acae803b..869a58c7441c 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -1,6 +1,5 @@ { lib, - python, buildPythonPackage, fetchFromGitHub, setuptools, @@ -9,6 +8,23 @@ numpy, lxml, trimesh, + + # optional deps + colorlog, + manifold3d, + charset-normalizer, + jsonschema, + networkx, + svg-path, + pycollada, + shapely, + xxhash, + rtree, + httpx, + scipy, + pillow, + mapbox-earcut, + embreex, }: buildPythonPackage rec { @@ -29,7 +45,7 @@ buildPythonPackage rec { dependencies = [ numpy ]; - optional-dependencies = with python.pkgs; { + optional-dependencies = { easy = [ colorlog