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: ec29bb50bf45
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d08fc1a002c5
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 3, 2020

  1. nixos-manual: boot.extraTTYs -> console.extraTTYs

    @lovesegfault
    lovesegfault committed Jan 3, 2020
    Copy the full SHA
    992245f View commit details

  2. rogue: boot.extraTTYs -> console.extraTTYs

    @lovesegfault
    lovesegfault committed Jan 3, 2020
    Copy the full SHA
    d80570f View commit details

  3. Merge pull request #76852 from lovesegfault/fix-manual-boot-console 

    nixos-manual: boot.extraTTYs -> console.extraTTYs
    @grahamc
    grahamc authored Jan 3, 2020
    Copy the full SHA
    d08fc1a View commit details
Showing with 2 additions and 2 deletions.
  1. +1 −1 nixos/modules/services/misc/nixos-manual.nix
  2. +1 −1 nixos/modules/services/misc/rogue.nix
2 changes: 1 addition & 1 deletion nixos/modules/services/misc/nixos-manual.nix
View file
Original file line number Diff line number Diff line change
@@ -52,7 +52,7 @@ in
};
})
(mkIf (cfg.showManual && cfgd.enable && cfgd.nixos.enable) {
boot.extraTTYs = [ "tty${toString cfg.ttyNumber}" ];
console.extraTTYs = [ "tty${toString cfg.ttyNumber}" ];

systemd.services.nixos-manual = {
description = "NixOS Manual";
2 changes: 1 addition & 1 deletion nixos/modules/services/misc/rogue.nix
View file
Original file line number Diff line number Diff line change
@@ -40,7 +40,7 @@ in

config = mkIf cfg.enable {

boot.extraTTYs = [ cfg.tty ];
console.extraTTYs = [ cfg.tty ];

systemd.services.rogue =
{ description = "Rogue dungeon crawling game";