flake: partition dev inputs#1289
Conversation
|
currently marked as a draft because the testbed logic needs to be refactored to enable flake-parts to see what testbeds exist as mentioned in #1208 (comment). not entirely sure how to go about that, would probably be best to do in a separate pr. |
My vague idea is to split testbed.nix's Stage 1 collects the testbed modules and forms them into an attrset of {name → module}. This bit is needed in the top-level flake configuration. Stage 2 maps those modules into nixos VM systems. This is done in the dev partition. This would probably need to be done in separate files, as otherwise it'll be difficult to call the testbed.nix file from the flake, without supplying inputs needed for Stage 2. |
I think avoiding a major refactor of the testbeds would be a bad idea just because there's a lot of other prs editing it them, hopefully we can get them merged soon. |
474a30f to
2500be1
Compare
48b0d21 to
ca969c2
Compare
ca969c2 to
94c7749
Compare
Co-authored-by: Matt Sturgeon <matt@sturgeon.me.uk> Co-authored-by: NAHO <90870942+trueNAHO@users.noreply.github.com>
trueNAHO
left a comment
There was a problem hiding this comment.
LGTM. Good job, everyone. Great to see this getting merged.
For reference, I have successfully tested this PR in my standalone Home Manager setup:
Tested-by: NAHO <90870942+trueNAHO@users.noreply.github.com>
|
Backport failed for Please cherry-pick the changes locally and resolve any conflicts. git fetch origin release-25.05
git worktree add -d .worktree/backport-1289-to-release-25.05 origin/release-25.05
cd .worktree/backport-1289-to-release-25.05
git switch --create backport-1289-to-release-25.05
git cherry-pick -x a5c1532ab8bf9566331f83be91517e02132f3d99 |
|
I will take care of the manual backport |
Link: nix-community#1289 Reviewed-by: Daniel Thwaites <danth@danth.me> Co-authored-by: Matt Sturgeon <matt@sturgeon.me.uk> Co-authored-by: NAHO <90870942+trueNAHO@users.noreply.github.com> Tested-by: NAHO <90870942+trueNAHO@users.noreply.github.com>
Link: nix-community#1289 Reviewed-by: Daniel Thwaites <danth@danth.me> Co-authored-by: Matt Sturgeon <matt@sturgeon.me.uk> Co-authored-by: NAHO <90870942+trueNAHO@users.noreply.github.com> Tested-by: NAHO <90870942+trueNAHO@users.noreply.github.com>
Link: #1289 Reviewed-by: Daniel Thwaites <danth@danth.me> Co-authored-by: Matt Sturgeon <matt@sturgeon.me.uk> Co-authored-by: NAHO <90870942+trueNAHO@users.noreply.github.com> Tested-by: NAHO <90870942+trueNAHO@users.noreply.github.com>
Re-apply commit 0f93e58 ("flake: infer default.nix import path (nix-community#1544)") that was accidentally reverted in commit a5c1532 ("flake: partition dev inputs (nix-community#1289)").
Link: nix-community#1289 Reviewed-by: Daniel Thwaites <danth@danth.me> Co-authored-by: Matt Sturgeon <matt@sturgeon.me.uk> Co-authored-by: NAHO <90870942+trueNAHO@users.noreply.github.com> Tested-by: NAHO <90870942+trueNAHO@users.noreply.github.com>
Re-apply commit 0f93e58 ("flake: infer default.nix import path (nix-community#1544)") that was accidentally reverted in commit a5c1532 ("flake: partition dev inputs (nix-community#1289)"). Link: nix-community#1636 Reviewed-by: awwpotato <awwpotato@voidq.com>
Match nixpkgs and dev-nixpkgs input references, aligning with commit 90f95c5 ("stylix: point nixpkgs input to more conventional nixos-unstable ref (nix-community#712)"). Fixes: a5c1532 ("flake: partition dev inputs (nix-community#1289)")
Fixes: a5c1532 ("flake: partition dev inputs (nix-community#1289)")
Fixes: a5c1532 ("flake: partition dev inputs (nix-community#1289)")
Fixes: a5c1532 ("flake: partition dev inputs (nix-community#1289)")
follow up to #1208
cc @trueNAHO @MattSturgeon
Things done
Notify maintainers