From 8088349c28a2a9396a3653d4519734e7bae3c4dc Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 13 Feb 2025 23:26:31 +0100 Subject: [PATCH 1/2] python313Packages.trimesh: 4.6.1 -> 4.6.2 Changelog: https://github.com/mikedh/trimesh/releases/tag/4.6.2 --- 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 a1ff069ce3fe..22b53464b9dd 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "trimesh"; - version = "4.6.1"; + version = "4.6.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-/uoiGFhKZnEzinDryUMwpoxZwSggV0ZPd9kqgB1vQPI="; + hash = "sha256-z7mWi1libCZhLqXK2sBV2X0Rkkf0YNdbM/T3gRd4VdY="; }; build-system = [ setuptools ]; From 27c658d7a9263d387d80a4b568f09a63d3b3c6be Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 14 Feb 2025 11:09:49 +0100 Subject: [PATCH 2/2] python313Packagea.trimesh: modernize --- .../python-modules/trimesh/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 22b53464b9dd..7d8db0b0ad66 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, setuptools, pytestCheckHook, pythonOlder, @@ -16,9 +16,11 @@ buildPythonPackage rec { disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-z7mWi1libCZhLqXK2sBV2X0Rkkf0YNdbM/T3gRd4VdY="; + src = fetchFromGitHub { + owner = "mikedh"; + repo = "trimesh"; + tag = version; + hash = "sha256-ttOawg1mdGkV1Pi0CmFR4VtmZ9MUxPed0KoXLwlbUPE="; }; build-system = [ setuptools ]; @@ -39,13 +41,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "trimesh" ]; - meta = with lib; { + meta = { description = "Python library for loading and using triangular meshes"; homepage = "https://trimesh.org/"; changelog = "https://github.com/mikedh/trimesh/releases/tag/${version}"; - license = licenses.mit; + license = lib.licenses.mit; mainProgram = "trimesh"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ gebner pbsds ];