Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 66222ad55547
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 98481cfdfa42
Choose a head ref
  • 3 commits
  • 6 files changed
  • 1 contributor

Commits on Mar 24, 2020

  1. services/misc/nixos-manual.nix: Remove 

    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 #83157.
    @edolstra
    edolstra committed Mar 24, 2020
    1
    Copy the full SHA
    aebf9a4 View commit details

  2. Remove unused 'rogue' service

    @edolstra
    edolstra committed Mar 24, 2020
    Copy the full SHA
    bd379be View commit details

  3. Merge pull request #83199 from edolstra/remove-manual-service 

    Remove manual service
    @edolstra
    edolstra authored Mar 24, 2020
    Copy the full SHA
    98481cf View commit details
3 changes: 1 addition & 2 deletions nixos/doc/manual/installation/installing.xml
View file
Original file line number Diff line number Diff line change
@@ -24,8 +24,7 @@
</para>

<para>
The NixOS manual is available on virtual console 8 (press Alt+F8 to access)
or by running <command>nixos-help</command>.
The NixOS manual is available by running <command>nixos-help</command>.
</para>

<para>
4 changes: 1 addition & 3 deletions nixos/modules/misc/documentation.nix
View file
Original file line number Diff line number Diff line change
@@ -218,9 +218,7 @@ in
++ optionals config.services.xserver.enable [ desktopItem pkgs.nixos-icons ]);

services.mingetty.helpLine = mkIf cfg.doc.enable (
"\nRun `nixos-help` "
+ optionalString config.services.nixosManual.showManual "or press <Alt-F${toString config.services.nixosManual.ttyNumber}> "
+ "for the NixOS manual."
"\nRun 'nixos-help' for the NixOS manual."
);
})

2 changes: 0 additions & 2 deletions nixos/modules/module-list.nix
View file
Original file line number Diff line number Diff line change
@@ -469,7 +469,6 @@
./services/misc/nix-daemon.nix
./services/misc/nix-gc.nix
./services/misc/nix-optimise.nix
./services/misc/nixos-manual.nix
./services/misc/nix-ssh-serve.nix
./services/misc/novacomd.nix
./services/misc/nzbget.nix
@@ -485,7 +484,6 @@
./services/misc/redmine.nix
./services/misc/rippled.nix
./services/misc/ripple-data-api.nix
./services/misc/rogue.nix
./services/misc/serviio.nix
./services/misc/safeeyes.nix
./services/misc/sickbeard.nix
4 changes: 0 additions & 4 deletions nixos/modules/profiles/installation-device.nix
View file
Original file line number Diff line number Diff line change
@@ -26,10 +26,6 @@ with lib;

# Show the manual.
documentation.nixos.enable = mkForce true;
services.nixosManual.showManual = true;

# Let the user play Rogue on TTY 8 during the installation.
#services.rogue.enable = true;

# Use less privileged nixos user
users.users.nixos = {
73 changes: 0 additions & 73 deletions nixos/modules/services/misc/nixos-manual.nix
View file

This file was deleted.

62 changes: 0 additions & 62 deletions nixos/modules/services/misc/rogue.nix
View file

This file was deleted.