Skip to content
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

Jump to bottom

refactor: move development inputs/outputs back to dev flake #458

Merged
merged 2 commits into from
Jan 22, 2025
Merged

refactor: move development inputs/outputs back to dev flake #458

merged 2 commits into from
Jan 22, 2025

Conversation

getchoo
Copy link
Member

@getchoo getchoo commented Jan 17, 2025

Follow up on #390

Now that Nix 2.26 can handle subflakes in a much better way, I think we're good to adopt this again. Only issue is that the subflake will require that in-development version of 2.26; shouldn't be a big deal though as most of the time this is only used by CI, and nix shell makes things easy

@getchoo getchoo added this to the 2.0.0 milestone Jan 17, 2025
@getchoo getchoo requested a review from isabelroses January 17, 2025 19:03
@getchoo getchoo force-pushed the getchoo/subflake-again branch 3 times, most recently from c059b70 to a00d2ef Compare January 18, 2025 04:39
@getchoo getchoo marked this pull request as draft January 18, 2025 04:46
@getchoo
Copy link
Member Author

getchoo commented Jan 18, 2025

Looks like nix-eval-jobs doesn't support Nix 2.26 just yet, and I'm still having some trouble convincing the Nix installer actions to use the random build from Hydra

This will be on the back burner for now, but I consider it a blocker for 2.0 (as I'd rather not make a stable release with the Flake inputs in their current form)

@getchoo getchoo force-pushed the getchoo/subflake-again branch from a00d2ef to 7bea6b5 Compare January 18, 2025 10:19
@isabelroses
Copy link
Member

I'm still having some trouble convincing the Nix installer actions to use the random build from Hydra

That's because DeterminateSystems/nix-installer-action expects "a URL pointing to the nix-installer binary". At this time I don't believe there is a way to change the nix version that is installed without specifying the version of the nix-installer or forking the repo to provide the chosen release.

@getchoo
Copy link
Member Author

getchoo commented Jan 18, 2025

That's because DeterminateSystems/nix-installer-action expects "a URL pointing to the nix-installer binary".

That's for source-url. nix-package-url is what we're looking for, and it works...but only on Linux. On macOS the tarball seems to be downloaded just fine, but running commands from it fails here. Still an improvement over the situation with the Cachix though, where we would need to use the official installation script -- which even when built on Hydra links to a (non-existent) tarball on releases.nixos.org 🫠

Might need to just use a different revision of Nix from Hydra to fix the Mac issues, but not sure yet

@getchoo
Copy link
Member Author

getchoo commented Jan 18, 2025

Looks like nix-eval-jobs doesn't support Nix 2.26 just yet

Pulled in nix-community/nix-eval-jobs#341, which adds support for the new Meson infra in Nix. It fixes building nix-eval-jobs/nix-fast-build, but evaluation still fails; might be a regression in the Nix build. Will need to play with it more

If I can figure out the macOS installation issues first, we may just switch to a more traditional CI scheme w/o nix-fast-build. Would probably be a simple nix flake check to build the module tests and a linkFarm of all of our packages

@getchoo getchoo force-pushed the getchoo/subflake-again branch 2 times, most recently from 39a76ad to b0c7df5 Compare January 22, 2025 20:06
@getchoo
refactor: move development inputs/outputs back to dev flake
7ae2059
@getchoo
ci: drop nix-fast-build
96cbb45 
Doesn't work with Nix 2.26 yet, maybe we'll use it again some day
For now, Nix's default scheduling with a linkFarm and `nix flake check`
should be fine
@getchoo getchoo force-pushed the getchoo/subflake-again branch from b0c7df5 to 96cbb45 Compare January 22, 2025 20:18
@getchoo
Copy link
Member Author

getchoo commented Jan 22, 2025

Nix 2.26 released and I implemented the CI changes mentioned above. This should be good to go!

@getchoo getchoo marked this pull request as ready for review January 22, 2025 20:33
@getchoo getchoo merged commit 6c244e5 into main Jan 22, 2025
9 checks passed
@getchoo getchoo deleted the getchoo/subflake-again branch January 22, 2025 20:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@isabelroses isabelroses isabelroses approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
2.0.0
Development

Successfully merging this pull request may close these issues.
2 participants
@getchoo @isabelroses