Adding a Nix build to the CI, reimplementing the python wheels build too#78
Merged
toastedcrumpets merged 38 commits intomasterfrom May 19, 2025
Merged
Adding a Nix build to the CI, reimplementing the python wheels build too#78toastedcrumpets merged 38 commits intomasterfrom
toastedcrumpets merged 38 commits intomasterfrom
Conversation
Removed eigen3-devel as it's missing on some wheel systems
Another fix for normal wheels
toastedcrumpets
commented
May 19, 2025
Collaborator
Author
toastedcrumpets
left a comment
toastedcrumpets
left a comment
There was a problem hiding this comment.
No review needed.
Contributor
There was a problem hiding this comment.
Pull Request Overview
Adds a Nix-based build to the CI pipelines, reworks the Python wheels build, and standardizes Boost and OpenGL context handling on macOS.
- Introduces
derivation.nix/default.nixand updates CI jobs to runnix-buildinstead of vcpkg. - Refactors
pyproject.tomland.github/workflows/python_wheels.yamlfor list-style requirements and updatedcibuildwheelsettings. - Lowers Boost requirement from 1.70 to 1.66, removes vcpkg submodule, and patches macOS GL context typedef and retrieval.
Reviewed Changes
Copilot reviewed 13 out of 13 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
| src/magnet/magnet/GL/context.hpp | Added macOS branches for ContextKey and current context retrieval |
| src/magnet/CMakeLists.txt | Downgraded Boost requirement to 1.66 |
| src/dynamo/programs/dynahist_rw.cpp | Changed platform guard from Apple/Windows to __GLIBC__ |
| pyproject.toml | Switched requires to list form; trimmed classifiers and dependencies |
| derivation.nix / default.nix | New Nix expressions to build the Python package |
| .github/workflows/python_wheels.yaml | Updated checkout recursion and bump cibuildwheel |
| .github/workflows/ci.yaml | Replaced vcpkg jobs with Nix-based nix-build and nix-shell steps |
| .gitmodules | Removed extern/vcpkg submodule |
| .envrc | Enabled flake mode |
Comments suppressed due to low confidence (1)
src/dynamo/programs/dynahist_rw.cpp:523
- Using
__GLIBC__only enables exceptions on glibc-based systems. To cover all non-Apple/Windows platforms (e.g., musl, BSD), revert to the original#if !defined(__APPLE__) && !defined(_WIN32)or explicitly include other libc variants.
#ifdef __GLIBC__
| - name: Build the nix package | ||
| run: nix-build | ||
|
|
||
| hand-build: |
There was a problem hiding this comment.
[nitpick] The nix-build and hand-build jobs largely duplicate steps. Consider extracting shared steps into YAML anchors or a reusable workflow template to reduce duplication and simplify future updates.
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.