diff options
| author | Karel Kočí <cynerd@email.cz> | 2022-07-02 09:53:47 +0200 |
|---|---|---|
| committer | Karel Kočí <cynerd@email.cz> | 2022-07-02 09:53:47 +0200 |
| commit | e7e8404b2c04e7b361ff72d81d6273bd13d40800 (patch) | |
| tree | ee60ab67b3633bdb2f5ee6b3cdb34c32acc11f1e /nixos/modules | |
| parent | 3e53e2ab495ea95054c9160db8584110cae6c860 (diff) | |
| download | nixturris-e7e8404b2c04e7b361ff72d81d6273bd13d40800.tar.gz nixturris-e7e8404b2c04e7b361ff72d81d6273bd13d40800.tar.bz2 nixturris-e7e8404b2c04e7b361ff72d81d6273bd13d40800.zip | |
Fix build of Turris Mox
This breaks cross build of Omnia unfortunately.
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/turris-defaults.nix | 10 |
1 files changed, 4 insertions, 6 deletions
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 |