From fecfe143d77075bd87d0f2f756cf915cbbc9eb57 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 15 Jul 2025 22:20:57 +0200 Subject: [PATCH 1/3] manifold: 3.1.1 -> 3.2.0 Diff: https://github.com/elalish/manifold/compare/v3.1.1...v3.2.0 --- pkgs/by-name/ma/manifold/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/manifold/package.nix b/pkgs/by-name/ma/manifold/package.nix index 119fc497c73c..2dc418ed4d60 100644 --- a/pkgs/by-name/ma/manifold/package.nix +++ b/pkgs/by-name/ma/manifold/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "manifold"; - version = "3.1.1"; + version = "3.2.0"; src = fetchFromGitHub { owner = "elalish"; repo = "manifold"; - rev = "v${finalAttrs.version}"; - hash = "sha256-dCCTjWRjXSyuEDxGI9ZS2UTmLdZVSmDOmHFnhox3N+4="; + tag = "v${finalAttrs.version}"; + hash = "sha256-tcEjgOU90tYnlZDedHJvnqWFDDtXGx64G80wnWz4lBI="; }; nativeBuildInputs = [ cmake ]; @@ -44,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Geometry library for topological robustness"; homepage = "https://github.com/elalish/manifold"; + changelog = "https://github.com/elalish/manifold/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ hzeller From 23c25da6bdedf85781fbcbbcf8634feec4729ee9 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 15 Jul 2025 22:21:31 +0200 Subject: [PATCH 2/3] python3Packages.manifold3d: 3.1.1 -> 3.2.0 Changelog: https://github.com/elalish/manifold/releases/tag/v3.2.0 --- pkgs/by-name/ma/manifold/package.nix | 4 ++++ pkgs/development/python-modules/manifold3d/default.nix | 4 ++-- pkgs/top-level/python-packages.nix | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/manifold/package.nix b/pkgs/by-name/ma/manifold/package.nix index 2dc418ed4d60..e78e86fd42ed 100644 --- a/pkgs/by-name/ma/manifold/package.nix +++ b/pkgs/by-name/ma/manifold/package.nix @@ -41,6 +41,10 @@ stdenv.mkDerivation (finalAttrs: { test/manifold_test --gtest_filter=-CrossSection.RoundOffset ''; + passthru = { + tbb = tbb_2021; + }; + meta = { description = "Geometry library for topological robustness"; homepage = "https://github.com/elalish/manifold"; diff --git a/pkgs/development/python-modules/manifold3d/default.nix b/pkgs/development/python-modules/manifold3d/default.nix index 805d35f1d78e..967048702974 100644 --- a/pkgs/development/python-modules/manifold3d/default.nix +++ b/pkgs/development/python-modules/manifold3d/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "manifold3d"; - version = "3.1.1"; + version = "3.2.0"; pyproject = true; src = fetchFromGitHub { owner = "elalish"; repo = "manifold"; tag = "v${version}"; - hash = "sha256-dCCTjWRjXSyuEDxGI9ZS2UTmLdZVSmDOmHFnhox3N+4="; + hash = "sha256-tcEjgOU90tYnlZDedHJvnqWFDDtXGx64G80wnWz4lBI="; }; dontUseCmakeConfigure = true; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 86cadaed9737..35a4fc8056e6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8776,7 +8776,9 @@ self: super: with self; { callPackage ../development/python-modules/marionette-harness/manifestparser.nix { }; - manifold3d = callPackage ../development/python-modules/manifold3d { }; + manifold3d = callPackage ../development/python-modules/manifold3d { + inherit (pkgs.manifold.passthru) tbb; + }; manim = callPackage ../development/python-modules/manim { }; From acd5e460a55e4227f981bff774db704dd1729786 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 15 Jul 2025 23:57:31 +0200 Subject: [PATCH 3/3] python3Packages.manifold3d: use src from manifold --- pkgs/by-name/ma/manifold/package.nix | 15 ++++++++++---- .../python-modules/manifold3d/default.nix | 20 ++++++++----------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/ma/manifold/package.nix b/pkgs/by-name/ma/manifold/package.nix index e78e86fd42ed..55e596fee69c 100644 --- a/pkgs/by-name/ma/manifold/package.nix +++ b/pkgs/by-name/ma/manifold/package.nix @@ -7,6 +7,7 @@ gtest, glm, tbb_2021, + python3Packages, }: stdenv.mkDerivation (finalAttrs: { @@ -43,6 +44,9 @@ stdenv.mkDerivation (finalAttrs: { passthru = { tbb = tbb_2021; + tests = { + python = python3Packages.manifold3d; + }; }; meta = { @@ -50,10 +54,13 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/elalish/manifold"; changelog = "https://github.com/elalish/manifold/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ - hzeller - pca006132 - ]; + maintainers = + with lib.maintainers; + [ + hzeller + pca006132 + ] + ++ python3Packages.manifold3d.meta.maintainers; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/development/python-modules/manifold3d/default.nix b/pkgs/development/python-modules/manifold3d/default.nix index 967048702974..e4f95df9e637 100644 --- a/pkgs/development/python-modules/manifold3d/default.nix +++ b/pkgs/development/python-modules/manifold3d/default.nix @@ -4,6 +4,7 @@ python, fetchFromGitHub, scikit-build-core, + manifold, cmake, ninja, nanobind, @@ -17,16 +18,9 @@ buildPythonPackage rec { pname = "manifold3d"; - version = "3.2.0"; + inherit (manifold) version src; pyproject = true; - src = fetchFromGitHub { - owner = "elalish"; - repo = "manifold"; - tag = "v${version}"; - hash = "sha256-tcEjgOU90tYnlZDedHJvnqWFDDtXGx64G80wnWz4lBI="; - }; - dontUseCmakeConfigure = true; build-system = [ @@ -60,10 +54,12 @@ buildPythonPackage rec { ]; meta = { - description = "Geometry library for topological robustness"; - homepage = "https://github.com/elalish/manifold"; - changelog = "https://github.com/elalish/manifold/releases/tag/${src.tag}"; - license = lib.licenses.asl20; + inherit (manifold.meta) + homepage + changelog + description + license + ; maintainers = with lib.maintainers; [ pbsds pca006132