nixos/macos-builder: review comments from #206951#207486
Closed
SuperSandro2000 wants to merge 1 commit intoNixOS:masterfrom
Closed
nixos/macos-builder: review comments from #206951#207486SuperSandro2000 wants to merge 1 commit intoNixOS:masterfrom
SuperSandro2000 wants to merge 1 commit intoNixOS:masterfrom
Conversation
github-actions
bot
added
6.topic: nixos
Merged
13 tasks
Comment on lines
+39
to
+44
| networking.nameservers = let | ||
| ns = config.networking.nameservers; | ||
| in if ns == [ ] then | ||
| [ "8.8.8.8" ] | ||
| else | ||
| ns; |
Contributor
There was a problem hiding this comment.
Wouldn't this trigger infinite recursion?
Comment on lines
+69
to
+72
| install = hostPkgs.coreutils}/bin/install; | ||
| in pkgs.writeShellScript "install-credentials" '' | ||
| "${install}" -g nixbld -m 600 "''${1}/${user}_${keyType}" ${privateKey} | ||
| "${install}" -g nixbld -m 644 "''${1}/${user}_${keyType}.pub" ${publicKey} |
Contributor
There was a problem hiding this comment.
I don't feel like this improves the readability of the Nix code, but at the expense of the readability of the generated script
I think whether or not the install should be inlined is debatable, but definitely the change to inline KEYS feels like a clear regression for readability
| }); | ||
|
|
||
| system.stateVersion = "22.05"; | ||
| inherit (config.system) stateVersion; |
Contributor
There was a problem hiding this comment.
There are two issues here:
- This sets
stateVersionand notsystem.stateVersion - If it were changed to set
system.stateVersionthen this also seems like it would also trigger infinite recursion.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of changes
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)nixos/doc/manual/md-to-db.shto update generated release notes