Skip to content

flake: partition dev inputs#1289

Merged
trueNAHO merged 1 commit intonix-community:masterfrom
0xda157:dev-flake-inputs
Jul 6, 2025
Merged

flake: partition dev inputs#1289
trueNAHO merged 1 commit intonix-community:masterfrom
0xda157:dev-flake-inputs

Conversation

@0xda157
Copy link
Copy Markdown
Contributor

@0xda157 0xda157 commented May 17, 2025

follow up to #1208
cc @trueNAHO @MattSturgeon

Things done

Notify maintainers

@0xda157 0xda157 marked this pull request as draft May 17, 2025 00:40
@0xda157
Copy link
Copy Markdown
Contributor Author

0xda157 commented May 17, 2025

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.

@0xda157 0xda157 force-pushed the dev-flake-inputs branch from 0c39dc0 to 27365c0 Compare May 17, 2025 00:58
@MattSturgeon
Copy link
Copy Markdown
Member

MattSturgeon commented May 17, 2025

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 autoload into two stages.

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.

@0xda157
Copy link
Copy Markdown
Contributor Author

0xda157 commented May 20, 2025

My vague idea is to split testbed.nix's autoload into two stages.

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.

@0xda157 0xda157 force-pushed the dev-flake-inputs branch 4 times, most recently from 48b0d21 to ca969c2 Compare June 16, 2025 23:57
@0xda157 0xda157 requested a review from trueNAHO July 6, 2025 20:13
@0xda157 0xda157 mentioned this pull request Jul 6, 2025
5 tasks
Co-authored-by: Matt Sturgeon <matt@sturgeon.me.uk>
Co-authored-by: NAHO <90870942+trueNAHO@users.noreply.github.com>
@0xda157 0xda157 force-pushed the dev-flake-inputs branch from bc81413 to 48c4dd3 Compare July 6, 2025 20:50
Copy link
Copy Markdown
Member

@MattSturgeon MattSturgeon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still LGTM

Copy link
Copy Markdown
Member

@trueNAHO trueNAHO left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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>

@trueNAHO trueNAHO merged commit a5c1532 into nix-community:master Jul 6, 2025
5 checks passed
@stylix-automation
Copy link
Copy Markdown
Contributor

Backport failed for release-25.05, because it was unable to cherry-pick the commit(s).

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

@0xda157 0xda157 deleted the dev-flake-inputs branch July 6, 2025 21:57
@0xda157
Copy link
Copy Markdown
Contributor Author

0xda157 commented Jul 6, 2025

I will take care of the manual backport

0xda157 added a commit to 0xda157/stylix that referenced this pull request Jul 6, 2025
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>
0xda157 added a commit to 0xda157/stylix that referenced this pull request Jul 6, 2025
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>
trueNAHO added a commit that referenced this pull request Jul 8, 2025
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>
trueNAHO added a commit to trueNAHO/stylix that referenced this pull request Jul 8, 2025
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)").
trueNAHO added a commit that referenced this pull request Jul 8, 2025
Re-apply commit 0f93e58 ("flake: infer default.nix import path
(#1544)") that was accidentally reverted in commit a5c1532 ("flake:
partition dev inputs (#1289)").

Link: #1636

Reviewed-by: awwpotato <awwpotato@voidq.com>
stylix-automation bot pushed a commit that referenced this pull request Jul 8, 2025
Re-apply commit 0f93e58 ("flake: infer default.nix import path
(#1544)") that was accidentally reverted in commit a5c1532 ("flake:
partition dev inputs (#1289)").

Link: #1636

Reviewed-by: awwpotato <awwpotato@voidq.com>
(cherry picked from commit 1baa44c)
trueNAHO added a commit that referenced this pull request Jul 8, 2025
Re-apply commit 0f93e58 ("flake: infer default.nix import path
(#1544)") that was accidentally reverted in commit a5c1532 ("flake:
partition dev inputs (#1289)").

Link: #1636

Reviewed-by: awwpotato <awwpotato@voidq.com>
(cherry picked from commit 1baa44c)
LunaCOLON3 pushed a commit to LunaCOLON3/stylix that referenced this pull request Jul 14, 2025
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>
LunaCOLON3 pushed a commit to LunaCOLON3/stylix that referenced this pull request Jul 14, 2025
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>
trueNAHO added a commit to danth/stylix-fork that referenced this pull request Sep 28, 2025
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)")
trueNAHO added a commit to trueNAHO/stylix that referenced this pull request Nov 20, 2025
trueNAHO added a commit to trueNAHO/stylix that referenced this pull request Nov 20, 2025
Fixes: a5c1532 ("flake: partition dev inputs (nix-community#1289)")
trueNAHO added a commit to trueNAHO/stylix that referenced this pull request Nov 20, 2025
stylix-automation bot pushed a commit that referenced this pull request Nov 20, 2025
Fixes: a5c1532 ("flake: partition dev inputs (#1289)")
(cherry picked from commit 2d741ac)
stylix-automation bot pushed a commit that referenced this pull request Nov 20, 2025
Fixes: a5c1532 ("flake: partition dev inputs (#1289)")
(cherry picked from commit b82fa90)
stylix-automation bot pushed a commit that referenced this pull request Nov 20, 2025
Fixes: a5c1532 ("flake: partition dev inputs (#1289)")
(cherry picked from commit 0ef1d62)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

topic: dependencies Dependency updates

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants