From fd89332b4ab5f89a2a7df1252af76241d223c5e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 6 Jan 2021 07:42:50 +0100 Subject: [PATCH] raspberry-2: remove console.extraTTYs This option is no longer needed. Also remove boot.extraTTYs since NixOS is older than 20.03 is no longer supported. --- raspberry-pi/2/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/raspberry-pi/2/default.nix b/raspberry-pi/2/default.nix index eca03be..4774c15 100644 --- a/raspberry-pi/2/default.nix +++ b/raspberry-pi/2/default.nix @@ -1,8 +1,5 @@ { lib, pkgs, ...}: -let - hasConsoleExtraTTYs = lib.versionAtLeast (lib.versions.majorMinor lib.version) "21.03"; -in { boot = { consoleLogLevel = lib.mkDefault 7; @@ -21,11 +18,8 @@ in version = lib.mkDefault 2; }; }; - extraTTYs = lib.mkIf (!hasConsoleExtraTTYs) [ "ttyAMA0" ]; }; - console.extraTTYs = lib.mkIf hasConsoleExtraTTYs [ "ttyAMA0" ]; - nix.buildCores = 4; nixpkgs.config.platform = lib.systems.platforms.raspberrypi2;