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.

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

nixos/buildbot: fix eval, and some twin issues #77324

Merged
merged 2 commits into from Jan 12, 2020

Conversation

@worldofpeace
Copy link
Member

@worldofpeace worldofpeace commented Jan 8, 2020

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.
Notify maintainers

cc @

@worldofpeace
Copy link
Member Author

@worldofpeace worldofpeace commented Jan 8, 2020

@GrahamcOfBorg test buildbot

@@ -222,7 +222,7 @@ in {
};

config = mkIf cfg.enable {
users.groups = optional (cfg.group == "buildbot") {
users.groups = optionalAttrs (cfg.group == "buildbot") {

This comment has been minimized.

@Ma27

Ma27 Jan 9, 2020
Member

wouldn't it be better to always use mkIf for subtrees in the module system?

This comment has been minimized.

@worldofpeace

worldofpeace Jan 9, 2020
Author Member

They're almost used interchangeably if you search for users.groups = optionalAttrs or users.groups = mkIf that I lack a preference.

This comment has been minimized.

@worldofpeace

worldofpeace Jan 9, 2020
Author Member

Though combinations of the two with // is actually a bug, ref #72949 and what seemed like a seemingly mysterious issue #72916. One should then be mindful to use mkMerge and mkIf only.

@worldofpeace worldofpeace force-pushed the worldofpeace:buildbot-eval branch from a4a02c5 to 2af959e Jan 12, 2020
@worldofpeace worldofpeace merged commit d04c6e0 into NixOS:master Jan 12, 2020
@worldofpeace worldofpeace deleted the worldofpeace:buildbot-eval branch Jan 12, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.