aires/nixos-hardware
aires/nixos-hardware
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #222 from Mic92/fix-ci

Browse source 
raspberry-2: remove console.extraTTYs
This commit is contained in:
Jörg Thalheim 2021-01-06 06:53:13 +00:00 committed by GitHub
parent c242378e63 fd89332b4a
commit fb1682bab4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
raspberry-pi/2/default.nix
View file

@ -1,8 +1,5 @@
{ lib, pkgs, ...}: { lib, pkgs, ...}:
let
hasConsoleExtraTTYs = lib.versionAtLeast (lib.versions.majorMinor lib.version) "21.03";
in
{ {
boot = { boot = {
consoleLogLevel = lib.mkDefault 7; consoleLogLevel = lib.mkDefault 7;
@ -21,11 +18,8 @@ in
version = lib.mkDefault 2; version = lib.mkDefault 2;
}; };
}; };
extraTTYs = lib.mkIf (!hasConsoleExtraTTYs) [ "ttyAMA0" ];
}; };
console.extraTTYs = lib.mkIf hasConsoleExtraTTYs [ "ttyAMA0" ];
nix.buildCores = 4; nix.buildCores = 4;
nixpkgs.config.platform = lib.systems.platforms.raspberrypi2; nixpkgs.config.platform = lib.systems.platforms.raspberrypi2;