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

Manual fixes: users.extraUsers -> users.users #42746

Merged
merged 2 commits into from Jun 29, 2018
Merged

Manual fixes: users.extraUsers -> users.users #42746

merged 2 commits into from Jun 29, 2018

Conversation

flokli
Copy link
Contributor

@flokli flokli commented Jun 28, 2018

Motivation for this change

This fixes some oddities while reading through the NixOS manual.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

@flokli
manual: rename users.extraUsers to users.users
6cabce9 
Is called like this since 14321ae, but
docs were still using the old option in some cases.

Reported-By: Cedric Shahabi <cedric.shahabi@gmail.com>
@flokli
manual: rename user added to networkmanager from "youruser" to "alice"
329983f 
to be consistent with the rest of the manual

Reported-By: Cedric Shahabi <cedric.shahabi@gmail.com>
@flokli
Copy link
Contributor Author

flokli commented Jun 28, 2018

There's a lot of usages ofusers.extraUsers, which in theory should all be replaced to users.users - I wanted to start with docs first ;-)

I'm not sure about whether it's worth the effort to backport this to 18.03. Having not confusing docs might maybe be nice ;-)

@xeji xeji merged commit 82550f5 into NixOS:master Jun 29, 2018
@xeji
Copy link
Contributor

xeji commented Jun 29, 2018

I tried to cherry-pick this to 18.03 but it's not that simple since all these links were not links in 18.03.
I'm too lazy to fix all these conflicts manually but feel free to open a separate PR if you like 😄

@flokli flokli deleted the manual-fixes-users-users branch June 29, 2018 23:00
@flokli flokli mentioned this pull request Jun 29, 2018
Merged
9 tasks
@flokli
Copy link
Contributor Author

flokli commented Jun 29, 2018

@xeji followup PR for 18.03 at #42792.

@volth If you don't object, I'll continue with fixing up usages in the module system itself - something for unstable only if you ask me…

@flokli flokli mentioned this pull request Jun 30, 2018
Merged
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
6.topic: nixos 8.has: documentation 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@flokli @xeji @GrahamcOfBorg