From b5849962dfb4eae3a5bc192ed8e9e066d00e8bd4 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 18 Nov 2024 10:05:53 +0100 Subject: [PATCH] python312Packages.manifold3d: 2.5.1 -> 3.0.0 changelog: https://github.com/elalish/manifold/releases/tag/v3.0.0 --- .../python-modules/manifold3d/default.nix | 21 ++----------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/manifold3d/default.nix b/pkgs/development/python-modules/manifold3d/default.nix index 62852fe60a0c..cb0468c6bff4 100644 --- a/pkgs/development/python-modules/manifold3d/default.nix +++ b/pkgs/development/python-modules/manifold3d/default.nix @@ -11,34 +11,20 @@ numpy, clipper2, tbb, - glm, pytestCheckHook, trimesh, }: -let - # archived library, but manifold3d has removed this on master - thrust-src = fetchFromGitHub { - owner = "NVIDIA"; - repo = "thrust"; - rev = "refs/tags/2.1.0"; - hash = "sha256-U9WgRZva7R/bNOF5VZTvIwIQDQDD3/bRO08j2TPLl9Q="; - fetchSubmodules = true; - }; - -in - buildPythonPackage rec { pname = "manifold3d"; - version = "2.5.1"; + version = "3.0.0"; pyproject = true; src = fetchFromGitHub { owner = "elalish"; repo = "manifold"; rev = "refs/tags/v${version}"; - hash = "sha256-0zjS4ygt85isP1jyiTCeD/umhQ8ffIN+u2CeLeybX9U="; - fetchSubmodules = true; + hash = "sha256-02bZAPA4mnWzS9NYVcSW0JE7BidrwzNKBO2nl7BxiiE="; }; dontUseCmakeConfigure = true; @@ -56,13 +42,10 @@ buildPythonPackage rec { ]; buildInputs = [ - glm tbb clipper2 ]; - env.SKBUILD_CMAKE_DEFINE = "FETCHCONTENT_SOURCE_DIR_THRUST=${thrust-src}"; - nativeCheckInputs = [ pytestCheckHook trimesh