From e7e8404b2c04e7b361ff72d81d6273bd13d40800 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Sat, 2 Jul 2022 09:53:47 +0200 Subject: Fix build of Turris Mox This breaks cross build of Omnia unfortunately. --- nixos/modules/turris-defaults.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'nixos/modules/turris-defaults.nix') diff --git a/nixos/modules/turris-defaults.nix b/nixos/modules/turris-defaults.nix index 0824a05..5de0d44 100644 --- a/nixos/modules/turris-defaults.nix +++ b/nixos/modules/turris-defaults.nix @@ -29,6 +29,8 @@ in { }; config = mkIf cnf.enable { + system.stateVersion = mkDefault "22.11"; + # We do not need Grub as U-Boot supports boot using extlinux like file boot.loader.grub.enable = mkDefault false; boot.loader.systemd-boot.enable = mkDefault false; @@ -45,10 +47,6 @@ in { # Use the latest kernel boot.kernelPackages = mkDefault pkgs.linuxPackages_latest; - #boot.kernelPackages = mkDefault (if (config.turris.board == "mox") then - # pkgs.linuxPackages_latest - #else - # pkgs.linuxPackages_5_15); # The supported deployment is on BTRFS boot.supportedFilesystems = [ "btrfs" ]; @@ -83,9 +81,9 @@ in { environment.systemPackages = with pkgs; [ htop ] ++ optionals (config.turris.board == "mox") [ - mox-otp + #mox-otp ] ++ optionals (config.turris.board == "omnia") [ - libatsha204 + #libatsha204 ]; # No need for installer tools in standard system -- cgit v1.2.3