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

Add assertion on distributedBuilds & buildMachines != [] #92415

Merged
merged 1 commit into from Jul 31, 2020
Merged

Add assertion on distributedBuilds & buildMachines != [] #92415

merged 1 commit into from Jul 31, 2020

Conversation

matthewbauer
Copy link
Member

Without distributedBuilds, you can’t use buildMachines flag.

Fixes #56593

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@matthewbauer
nixos/nix-daemon.nix: assert distributedBuilds and buildMachines!=[]
250885d 
Without distributedBuilds, you can’t use buildMachines flag.

Fixes NixOS#56593
@matthewbauer matthewbauer force-pushed the nix-daemon-distributed-builds branch from 2b51107 to 250885d Compare July 31, 2020 00:55
@matthewbauer matthewbauer merged commit ed1423b into NixOS:master Jul 31, 2020
tadeokondrak
tadeokondrak reviewed Jul 31, 2020
View reviewed changes
nixos/modules/services/misc/nix-daemon.nix
@@ -439,6 +439,13 @@ in

config = {

assertions = [
{
assertion = (!config.nix.distributedBuilds) && config.nix.buildMachines != [];
Copy link
Member

Choose a reason for hiding this comment

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

Since this uses &&, it requires both sides to be true for the assertion to succeed, and config.nix.buildMachines is [] if you haven't set up distributed builds.

Copy link
Member Author

Choose a reason for hiding this comment

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

oops - thanks, i was thinking of it backwards; fixed in 67b6e56

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tadeokondrak tadeokondrak tadeokondrak left review comments

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

Successfully merging this pull request may close these issues.

Setting buildMachines without distributedBuilds = true should throw an error
2 participants
@matthewbauer @tadeokondrak