python3Packages.build123d: init at 0.10.0#433247
python3Packages.build123d: init at 0.10.0#433247tnytown wants to merge 8 commits intoNixOS:masterfrom
Conversation
4026045 to
162fd40
Compare
|
Fixing the cyclic dependency of occt and vtk is a good point. |
162fd40 to
8c619f0
Compare
Done in #433252 with requested changes :) |
8c619f0 to
ff42ecd
Compare
6487dfb to
329ac73
Compare
|
Diff lgtm, untested |
329ac73 to
7f6a6a7
Compare
|
(Pushed because I realized I forgot a change in 29f3333dd114e0e084882a002ba223aa3e1bb1b6.) Running |
|
|
Hmm, seems to be a spurious failure? Can't imagine that these changes caused that issue. Rerunning ... |
0abc09a to
532cf72
Compare
Can we replace the cadquery vendered occt's headers with the nixpkgs's one c.f. https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=python-ocp#n107 So we can use the cadquery-ocp 7.9 branch with fetching submodule pywrap, no more splited source. |
Maybe? I think in that case we would have to investigate how the config in the new branch interacts with older headers. Then we need to do more work to validate that the build succeeds and doesn't produce undesirable side effects. I'm of the opinion that the current |
03a2d7a to
b38f314
Compare
qbisi
left a comment
There was a problem hiding this comment.
Some file structure change suggestions.
| (lib.cmakeFeature "LLVM_DIR" "${lib.getDev libllvm}/lib/cmake/llvm") | ||
| (lib.cmakeFeature "Clang_DIR" "${lib.getDev libclang}/lib/cmake/clang") |
There was a problem hiding this comment.
I dont know cross build. But put llvmPackages.{libclang,llvm} in buildInputs should be suffice to help cmake find the config module.
| description = "Python wrapper for OCCT generated using pywrap"; | ||
| homepage = "https://github.com/CadQuery/OCP"; | ||
| license = lib.licenses.asl20; | ||
| maintainers = with lib.maintainers; [ tnytown ]; |
There was a problem hiding this comment.
maybe add
broken = (lib.versions.majorMinor finalAttrs.version) != (lib.versions.majorMinor opencascade-occt');
to not block upgrade of opencascade-occt
f277fea to
30415b8
Compare
30415b8 to
d20f134
Compare
d20f134 to
a45624c
Compare
|
Took an initial stab at syncing cadquery-ocp and packaging 0.10.0. Some tests fail but weirdly they don't fail the build: |
|
@tnytown Sorry for late review, I made a separate draft pr following the build logic of your work: #491280. You can take that draft pr as my advice for change. I prefer the latest 7.9.3.1 release cause we need not patch ocp.toml / pywrap, though ocp-7.9.3.1 is not yet compatible with build123d-0.10.0 or cq-editor. I guess opencascade-occt 7.9.3 will have long term support (occt 8.0 is on the horizon so we will have both 7.9 and 8.0 for a long time). So it looks better we build cadquery-ocp based on occt 7.9.3. Further work needs to be done for cq-editor and build123d to valid the functionality of ocp-7.9.3 built on #491280. |
|
@qbisi no worries on the delay, thanks for cleaning the work up!
In this case, would you like to wait for official occt 7.9.3 support in build123d before we continue? I'm honestly not too enthused about the prospect of tracking down regressions with 7.9.3 given that we're already having weird issues with the test suite in 7.8.1. |
|
I just took a look and the latest (untagged) revision targets OCP 7.9! https://github.com/gumyr/build123d/blob/cb155f79d18f8247eb8e951617d0a3056be0ceec/pyproject.toml |
Depends on #433252.Fixes #245258.
Adds build123d and its dependencies:
ocpsvg,cadquery-ocp,lib3mf, andtrianglesolver. A lot of these were based on derivations originally in https://github.com/vinszent/cq-flake; although I had to make some fairly involved changes to compile the latest versions ofbuild123dandcadquery-ocp.Tagging @vinszent and @marcus7070 for visibility as you seem to be the most involved in creating and maintaining
cq-flake:)Happy to split any of these changes out into individual PRs if necessary!
Things done
passthru.tests.nixpkgs-reviewon this PR. See nixpkgs-review usage../result/bin/.Add a 👍 reaction to pull requests you find important.