Skip to content

Fix segfault in ocp #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 11, 2024
Merged

Fix segfault in ocp #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
79eb3fb
occt: apply blobfish patch
erooke Oct 11, 2024
e7a3d57
cadquery: run previously failing tests
erooke Oct 11, 2024
9db2d07
build123d: run previously segfaulting tests
erooke Oct 11, 2024
196e952
cq-warehouse: run previously failing tests
erooke Oct 11, 2024
e7ec050
docs: remove mention of failing tests
erooke Oct 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion pkgs/opencascade-occt/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
lib,
fetchpatch,
stdenv,
fetchurl,
cmake,
Expand All @@ -19,7 +20,6 @@
freeimage,
enableFreeimage ? false,
}:

stdenv.mkDerivation rec {
pname = "opencascade-occt";
version = "7.7.2";
Expand All @@ -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
Expand Down
2 changes: 0 additions & 2 deletions pkgs/python/build123d/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,6 @@ buildPythonPackage {
"test_single_object"
# Overly strict test
"test_version"
# TODO: why does this segfault
"test_ellipse_rotation"
];

}
9 changes: 0 additions & 9 deletions pkgs/python/cadquery/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 0 additions & 8 deletions pkgs/python/cq-warehouse/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
];

}
5 changes: 0 additions & 5 deletions readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down