From 79eb3fb16e8d148328c8507e3ff08f43365a6cdf Mon Sep 17 00:00:00 2001 From: Ethan Rooke Date: Fri, 11 Oct 2024 11:51:06 -0500 Subject: [PATCH 1/5] occt: apply blobfish patch --- pkgs/opencascade-occt/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/opencascade-occt/default.nix b/pkgs/opencascade-occt/default.nix index 56486ce..d2215ee 100644 --- a/pkgs/opencascade-occt/default.nix +++ b/pkgs/opencascade-occt/default.nix @@ -1,5 +1,6 @@ { lib, + fetchpatch, stdenv, fetchurl, cmake, @@ -19,7 +20,6 @@ freeimage, enableFreeimage ? false, }: - stdenv.mkDerivation rec { pname = "opencascade-occt"; version = "7.7.2"; @@ -31,6 +31,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-M0G/pJuxsJu5gRk0rIgC173/XxI1ERpmCtWjgr/0dyY="; }; + patches = [ + (fetchpatch { + url = "https://raw.githubusercontent.com/conda-forge/occt-feedstock/00ff0f68644d9582a4c30c01220e7de0f934d427/recipe/patches/blobfish.patch"; + sha256 = "sha256-5tqkx7W7VBw7qaseFgwBENKbGQ0iUYEL6SJHwGI9L/g="; + }) + ]; + nativeBuildInputs = [ cmake ninja From e7a3d57f69c8e3c97606461f731971765f473dad Mon Sep 17 00:00:00 2001 From: Ethan Rooke Date: Fri, 11 Oct 2024 12:25:57 -0500 Subject: [PATCH 2/5] cadquery: run previously failing tests --- pkgs/python/cadquery/default.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/python/cadquery/default.nix b/pkgs/python/cadquery/default.nix index 4df8cf1..0cb04c2 100644 --- a/pkgs/python/cadquery/default.nix +++ b/pkgs/python/cadquery/default.nix @@ -52,15 +52,6 @@ buildPythonPackage { typish ]; - disabledTests = [ - # TODO: why do these segfault? - "test_colors_assy0" - "test_colors_assy1" - "test_colors_fused_assy" - "testExtrude" - "testDXF" - ]; - nativeCheckInputs = [ pytestCheckHook ipython From 9db2d07fb930b888cf920950436f35b2bba4c4ea Mon Sep 17 00:00:00 2001 From: Ethan Rooke Date: Fri, 11 Oct 2024 12:27:42 -0500 Subject: [PATCH 3/5] build123d: run previously segfaulting tests --- pkgs/python/build123d/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/python/build123d/default.nix b/pkgs/python/build123d/default.nix index f6351fa..3b4bee6 100644 --- a/pkgs/python/build123d/default.nix +++ b/pkgs/python/build123d/default.nix @@ -63,8 +63,6 @@ buildPythonPackage { "test_single_object" # Overly strict test "test_version" - # TODO: why does this segfault - "test_ellipse_rotation" ]; } From 196e95260d6328b331e805baeb8a1733640d5550 Mon Sep 17 00:00:00 2001 From: Ethan Rooke Date: Fri, 11 Oct 2024 12:29:12 -0500 Subject: [PATCH 4/5] cq-warehouse: run previously failing tests --- pkgs/python/cq-warehouse/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/python/cq-warehouse/default.nix b/pkgs/python/cq-warehouse/default.nix index 857f854..157f587 100644 --- a/pkgs/python/cq-warehouse/default.nix +++ b/pkgs/python/cq-warehouse/default.nix @@ -33,12 +33,4 @@ buildPythonPackage { nativeCheckInputs = [ pytestCheckHook ]; - disabledTests = [ - "test_five_sprocket_chain" - "test_missing_link" - "test_oblique_plane" - "test_assemble_chain_transmission" - "test_make_link" - ]; - } From e7ec05095cd29822aa2bb89d2e61ecc2252529e4 Mon Sep 17 00:00:00 2001 From: Ethan Rooke Date: Fri, 11 Oct 2024 15:15:53 -0500 Subject: [PATCH 5/5] docs: remove mention of failing tests --- readme.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/readme.md b/readme.md index 2ef66fa..d48a3c5 100644 --- a/readme.md +++ b/readme.md @@ -3,11 +3,6 @@ Nix expressions to build [OCP](https://github.com/CadQuery/OCP) and related projects. Inspired by [vinszent/cq-flake](https://github.com/vinszent/cq-flake). -## Pardon the dust - -OCP and CadQuery build; albeit with a couple failing tests. Cleaning up a -couple of things and adding docs are next on the docket. - ## Usage If you just want to start up a `cq-editor` session right now you can do that with: