From e7e8404b2c04e7b361ff72d81d6273bd13d40800 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Sat, 2 Jul 2022 09:53:47 +0200
Subject: Fix build of Turris Mox

This breaks cross build of Omnia unfortunately.
---
 flake.lock                        | 12 ++++++------
 nixos/modules/turris-defaults.nix | 10 ++++------
 pkgs/default.nix                  |  4 +++-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/flake.lock b/flake.lock
index 22512ca..54db16c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "flake-utils": {
       "locked": {
-        "lastModified": 1652776076,
-        "narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=",
+        "lastModified": 1656065134,
+        "narHash": "sha256-oc6E6ByIw3oJaIyc67maaFcnjYOz1mMcOtHxbEf9NwQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "04c1b180862888302ddfb2e3ad9eaa63afc60cf8",
+        "rev": "bee6a7250dd1b01844a2de7e02e4df7d8a0a206c",
         "type": "github"
       },
       "original": {
@@ -16,11 +16,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1653738054,
-        "narHash": "sha256-IaR8iLN4Ms3f5EjU1CJkXSc49ZzyS5qv03DtVAti6/s=",
+        "lastModified": 1656633783,
+        "narHash": "sha256-nXMIGtQXBGzO57nkPxgEOx8HLRwVQ+d1WkOnE01JG4A=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "17b62c338f2a0862a58bb6951556beecd98ccda9",
+        "rev": "95e79164be1f7d883ed9ffda8b7d4ad3a17e6c1e",
         "type": "github"
       },
       "original": {
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
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 849edff..929d030 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -31,13 +31,15 @@ let
     mdbook = armv7lDisableCheck nixpkgs.mdbook;
     ell = armv7lDisableCheck nixpkgs.ell;
     polkit = armv7lDisableCheck nixpkgs.polkit;
-    udisks2 = armv7lDisableCheck nixpkgs.udisks2;
+    udisks2 = disableCheck nixpkgs.udisks2;
     udisks = udisks2;
     llvm = armv7lDisableCheck nixpkgs.llvm;
     llvm_14 = armv7lDisableCheck nixpkgs.llvm_14;
     jemalloc = armv7lDisableCheck nixpkgs.jemalloc;
     openssh = armv7lDisableCheck nixpkgs.openssh;
     nlohmann_json = armv7lDisableCheck nixpkgs.nlohmann_json;
+    libseccomp = armv7lDisableCheck nixpkgs.libseccomp;
+    openldap = armv7lDisableCheck nixpkgs.openldap;
     # Crosscompilation worarounds
     btrfs-progs = nixpkgs.btrfs-progs.overrideAttrs (oldAttrs: {
       configureFlags = ["--disable-python"];
-- 
cgit v1.2.3