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

nixos/nix-daemon: Organize buildMachine options with a submodule #83104

Merged
merged 3 commits into from Jul 5, 2020
Merged

nixos/nix-daemon: Organize buildMachine options with a submodule #83104

merged 3 commits into from Jul 5, 2020

Conversation

Valodim
Copy link
Contributor

@Valodim Valodim commented Mar 21, 2020

This PR picks up #47636. It changes the nix.buildMachine option from an attribute set to a submodule, with documentations and examples per option.

A couple of thoughts:

  1. The sshKey option is a secret path, which there is no good solution for so far. See Add types.secretPath #78640
  2. There's no assertion to check for presence of both system and systems at the same time, because I couldn't figure out how to do assertions per module nicely :) I guess it's an artifact anyways that there are even two options for this, I'd rather deprecate systems, and type system as str or listOf str, expecting the former to cover basically all cases.
  3. As per this suggestion, I put the features variables an enum, and added an "extra" option that allows freeform features. The idea is to have a somewhat curated list of commonly used names where typos can't happen, and move special ones to their own option.

Ttested this locally, works as expected :)

@Valodim Valodim force-pushed the distbuild-module branch 2 times, most recently from 502377a to 5093da7 Compare March 22, 2020 10:05
msteen
msteen suggested changes Mar 27, 2020
View reviewed changes
nixos/modules/services/misc/nix-daemon.nix Outdated Show resolved Hide resolved
nixos/modules/services/misc/nix-daemon.nix Outdated Show resolved Hide resolved
nixos/modules/services/misc/nix-daemon.nix Outdated Show resolved Hide resolved
@Valodim
Copy link
Contributor Author

Valodim commented Mar 27, 2020

@msteen thanks for the review :) fixed all your points.

I also changed system and systems to default to builtins.currentSystem if neither are set, that seems to be a reasonable default.

@Valodim Valodim requested a review from msteen March 27, 2020 21:31
msteen
msteen approved these changes Mar 27, 2020
View reviewed changes
Copy link
Contributor

@msteen msteen left a comment

Choose a reason for hiding this comment

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

Seems good to me now!

@infinisil infinisil self-requested a review April 14, 2020 12:34
@Valodim Valodim requested a review from infinisil April 16, 2020 20:26
@infinisil infinisil mentioned this pull request May 13, 2020
Closed
9 tasks
@Ericson2314
Copy link
Member

@Valodim thanks for picking this up for me! And @infinisil, thanks for letting me know.

@Ericson2314
Copy link
Member

Can you add a 20.09 change log breaking change notice?

@Valodim
Copy link
Contributor Author

Valodim commented Jul 5, 2020

I updated this to incorporate all feedback (and rebased on master).

I think we actually ended up compatible with (sane usage of) the previous definitions, at least the config implementation looks identical modulo handling of defaults to me, and the example from the previous documentation produces identical results.

There is a slight potential for errors in configs that used sloppy types before, e.g. a string value for maxJobs will lead to an error like this:

error: The option value 'nix.buildMachines.[definition 1-entry 1].maxJobs' in ... is not of type 'signed integer'.
I added an item to the release notes about that.

@Valodim Valodim requested a review from Ericson2314 July 5, 2020 14:58
@Ericson2314 Ericson2314 merged commit c09dd3b into NixOS:master Jul 5, 2020
@Valodim Valodim deleted the distbuild-module branch July 5, 2020 16:22
@B4dM4n B4dM4n mentioned this pull request Jul 5, 2020
Merged
11 tasks
@Artturin Artturin mentioned this pull request Jun 7, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@grahamc grahamc grahamc left review comments

@msteen msteen msteen approved these changes

@Ericson2314 Ericson2314 Ericson2314 approved these changes

@infinisil infinisil Awaiting requested review from infinisil

Assignees
No one assigned
Labels
6.topic: nixos 8.has: changelog 8.has: documentation 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@Valodim @Ericson2314 @grahamc @msteen @infinisil