From 0467359c62becdd0c11f7289a0ec52a477557e95 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Feb 2026 15:32:40 +0000 Subject: [PATCH 1/3] manifold: 3.3.2 -> 3.4.0 --- pkgs/by-name/ma/manifold/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/manifold/package.nix b/pkgs/by-name/ma/manifold/package.nix index 6e008987a82d..ecb2ac33d941 100644 --- a/pkgs/by-name/ma/manifold/package.nix +++ b/pkgs/by-name/ma/manifold/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "manifold"; - version = "3.3.2"; + version = "3.4.0"; src = fetchFromGitHub { owner = "elalish"; repo = "manifold"; tag = "v${finalAttrs.version}"; - hash = "sha256-583/phb0boc5ASFJN+DDn6bogeNPVYPBTgtcD/d/AS8="; + hash = "sha256-9h1MLEcqLpiFg8U5rRkR9Qa+ohzehEDCn5rNsN6swlQ="; }; nativeBuildInputs = [ cmake ]; From eff5ce4b15f249cfa470fc0b6b2af66f7874d816 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sat, 28 Feb 2026 14:27:07 +0100 Subject: [PATCH 2/3] manifold: drop glm and skipped test Co-Authored-By: pca006132 --- pkgs/by-name/ma/manifold/package.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/by-name/ma/manifold/package.nix b/pkgs/by-name/ma/manifold/package.nix index ecb2ac33d941..91a10d31c4a2 100644 --- a/pkgs/by-name/ma/manifold/package.nix +++ b/pkgs/by-name/ma/manifold/package.nix @@ -5,7 +5,6 @@ cmake, clipper2, gtest, - glm, onetbb, python3Packages, }: @@ -25,7 +24,6 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ gtest - glm onetbb ]; @@ -38,9 +36,7 @@ stdenv.mkDerivation (finalAttrs: { "-DMANIFOLD_PAR=TBB" ]; - excludedTestPatterns = lib.optionals stdenv.isDarwin [ - # https://github.com/elalish/manifold/issues/1306 - "Manifold.Simplify" + excludedTestPatterns = [ ]; doCheck = true; checkPhase = '' From 8167de0cd7ec5fdf9a91fed95c9c244e76d09610 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sat, 28 Feb 2026 14:27:52 +0100 Subject: [PATCH 3/3] manifold: use lib.escapeShellArg --- pkgs/by-name/ma/manifold/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ma/manifold/package.nix b/pkgs/by-name/ma/manifold/package.nix index 91a10d31c4a2..1d6cc8a60677 100644 --- a/pkgs/by-name/ma/manifold/package.nix +++ b/pkgs/by-name/ma/manifold/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { ]; doCheck = true; checkPhase = '' - test/manifold_test --gtest_filter=-${builtins.concatStringsSep ":" finalAttrs.excludedTestPatterns} + test/manifold_test --gtest_filter=-${lib.escapeShellArg (builtins.concatStringsSep ":" finalAttrs.excludedTestPatterns)} ''; passthru = {