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

Jump to bottom

Remove manual service #83199

Merged
merged 2 commits into from Mar 24, 2020
Merged

Remove manual service #83199

merged 2 commits into from Mar 24, 2020

Conversation

edolstra
Copy link
Member

Motivation for this change

This removes the nixos-manual service on TTY-8 since it isn't very useful (you can just run nixos-help) and is a security issue if people enable it in regular systems.

While I was at it, I also removed the rogue service (which has been disabled in the installer for a while).

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.

@edolstra edolstra mentioned this pull request Mar 23, 2020
Closed
@vcunat vcunat added the 9.needs: port to stable A PR needs a backport to the stable release. label Mar 23, 2020
@vcunat
Copy link
Member

vcunat commented Mar 23, 2020

Sounds good to me in principle. Let's add mkRemovedOptionModule I guess? I certainly assume porting to 20.03; I'm not sure about 19.09.

@rnhmjoj
Copy link
Contributor

rnhmjoj commented Mar 23, 2020

I think having the manual already open on the installer is useful and cool. Also rogue is nice when you have to wait for nix-install to finish.

I have a happy memory of the first time I installed NixOS: I was surprised to discover the non-graphical installer was so friendly compared to arch linux.
I'm not really happy to see these going away.

@rnhmjoj
Copy link
Contributor

rnhmjoj commented Mar 23, 2020

Maybe making the modules internal and only enabling them on the installer could be a solution.

primeos
primeos approved these changes Mar 23, 2020
View reviewed changes
Copy link
Member

@primeos primeos left a comment

Choose a reason for hiding this comment

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

LGTM, I like this approach and IMO we don't loose any functionality (regarding the default configuration) while removing unnecessary complexity.

Adding a nice error message for the removed modules would improve the user experience, but I consider it optional as there should be very few users (but in any case it would probably be nice to have).

@danbst
Copy link
Contributor

danbst commented Mar 24, 2020

https://github.com/NixOS/nixpkgs/blob/67c81af775efd0e9afea1d41b92b7eec9be89485/nixos/doc/manual/installation/installing.xml#L26-L29

This one too.

@edolstra
services/misc/nixos-manual.nix: Remove
aebf9a4 
Running the manual on a TTY is useless in the graphical ISOs and not
particularly useful in non-graphical ISOs (since you can also run
'nixos-help').

Fixes NixOS#83157.
@edolstra
Remove unused 'rogue' service
bd379be
@edolstra edolstra merged commit 98481cf into NixOS:master Mar 24, 2020
@edolstra edolstra deleted the remove-manual-service branch March 24, 2020 14:26
primeos added a commit to primeos/nixpkgs that referenced this pull request Mar 26, 2020
@primeos
nixosTests.installer: Don't wait for the nixos-manual service
216a7e7 
The nixos-manual service was removed in NixOS#83199 but we missed the check
in this test which prevents the "tested" job from succeeding [0][1].

[0]: https://hydra.nixos.org/build/115472896
[1]: https://hydra.nixos.org/build/115472896/nixlog/94/tail
@primeos primeos mentioned this pull request Mar 26, 2020
Merged
10 tasks
@worldofpeace
Copy link
Contributor

#83199 (comment)

This needs to use mkRemovedOptionModule, that's actually in the checklist for reviewing contributions in the nixpkgs manual.

@vcunat
Copy link
Member

vcunat commented Mar 29, 2020 •
edited

Like this? #83651

EDIT: I assume we will pick all the related changes to 20.03.

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

@primeos primeos primeos approved these changes

@infinisil infinisil Awaiting requested review from infinisil

Assignees
No one assigned
Labels
6.topic: nixos 8.has: documentation 8.has: module (update) 9.needs: port to stable A PR needs a backport to the stable release. 10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@edolstra @vcunat @rnhmjoj @danbst @worldofpeace @samueldr @primeos