From 0dd72b31f4e7acb76f9b672214c253e92d4f1580 Mon Sep 17 00:00:00 2001
From: catvayor <catvayor@katvayor.net>
Date: Wed, 18 Sep 2024 09:10:07 +0200
Subject: [PATCH 1/2] feat(ci): use ci.nix

---
 .forgejo/workflows/build.yaml            | 22 +++++++++++++++++++++-
 ci.nix                                   |  4 ++--
 default.nix                              |  9 ++++++---
 tests/ext4/test.nix                      |  2 +-
 tests/fennel/test.nix                    |  2 +-
 tests/inout/test.nix                     |  2 +-
 tests/jffs2/configuration.nix            |  1 -
 tests/jffs2/test.nix                     |  2 +-
 tests/min-copy-closure/configuration.nix |  1 -
 tests/min-copy-closure/test.nix          |  2 +-
 tests/pppoe/test.nix                     |  2 +-
 tests/tftpboot/test.nix                  |  3 ++-
 tests/updown/test.nix                    |  2 +-
 tests/wlan/test.nix                      |  4 ++--
 14 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml
index dcb2ee4..3a29607 100644
--- a/.forgejo/workflows/build.yaml
+++ b/.forgejo/workflows/build.yaml
@@ -17,4 +17,24 @@ jobs:
       - name: Build VM QEMU MIPS
         run: |
           # Enter the shell
-          nix-build -I liminix-config=./examples/hello-from-qemu.nix --arg device "import ./devices/qemu" -A outputs.default
+          nix-build ci.nix -A qemu
+
+  build_zyxel-nwa50ax_mips:
+    runs-on: nix
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Build VM QEMU MIPS
+        run: |
+          # Enter the shell
+          nix-build ci.nix -A qemu
+
+  test_hostapd:
+    runs-on: nix
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Build VM QEMU MIPS
+        run: |
+          # Enter the shell
+          nix-build ci.nix -A wlan
diff --git a/ci.nix b/ci.nix
index 07d26f1..73d8c97 100644
--- a/ci.nix
+++ b/ci.nix
@@ -7,7 +7,7 @@
 let
   pkgs = (import nixpkgs { });
   borderVmConf =  ./bordervm.conf-example.nix;
-  inherit (pkgs.lib.attrsets) genAttrs;
+  inherit (pkgs.lib.attrsets) genAttrs mapAttrs;
   devices = [
     "qemu"
     "zyxel-nwa50ax"
@@ -19,7 +19,7 @@ let
       device = import (liminix + "/devices/${name}");
       liminix-config = vanilla;
     }).outputs.default;
-  tests = import ./tests/ci.nix;
+  tests = mapAttrs (_: v: v { inherit liminix nixpkgs; }) (import ./tests/ci.nix);
   jobs =
     (genAttrs devices for-device) //
     tests //
diff --git a/default.nix b/default.nix
index e372095..33593dc 100644
--- a/default.nix
+++ b/default.nix
@@ -26,9 +26,12 @@ let
   eval = evalModules {
     modules = [
       {
-        nixpkgs.overlays = [
-          overlay
-        ];
+        nixpkgs = {
+          overlays = [ overlay ];
+          config.permittedInsecurePackages = [
+            "python-2.7.18.8"
+          ];
+        };
       }
       device.module
       liminix-config
diff --git a/tests/ext4/test.nix b/tests/ext4/test.nix
index f972583..5c5a582 100644
--- a/tests/ext4/test.nix
+++ b/tests/ext4/test.nix
@@ -6,7 +6,7 @@ let img = (import liminix {
       device = import "${liminix}/devices/qemu/";
       liminix-config = ./configuration.nix;
     }).outputs.vmroot;
-    pkgs = import <nixpkgs> { overlays = [(import ../../overlay.nix)]; };
+    pkgs = import nixpkgs { overlays = [(import ../../overlay.nix)]; };
 in pkgs.runCommand "check" {
   nativeBuildInputs = with pkgs; [
     expect
diff --git a/tests/fennel/test.nix b/tests/fennel/test.nix
index fda2a89..81206d9 100644
--- a/tests/fennel/test.nix
+++ b/tests/fennel/test.nix
@@ -4,7 +4,7 @@
 }:
 let
   overlay = import "${liminix}/overlay.nix";
-  pkgs = import <nixpkgs> { overlays = [overlay]; };
+  pkgs = import nixpkgs { overlays = [overlay]; };
   script = pkgs.writeFennelScript "foo" [] ./hello.fnl;
   inherit (pkgs.lua.pkgs) fifo;
   netlink = pkgs.netlink-lua;
diff --git a/tests/inout/test.nix b/tests/inout/test.nix
index 5f382e4..3f3b198 100644
--- a/tests/inout/test.nix
+++ b/tests/inout/test.nix
@@ -6,7 +6,7 @@ let img = (import liminix {
       device = import "${liminix}/devices/qemu/";
       liminix-config = ./configuration.nix;
     }).outputs.vmroot;
-    pkgs = import <nixpkgs> { overlays = [(import ../../overlay.nix)]; };
+    pkgs = import nixpkgs { overlays = [(import ../../overlay.nix)]; };
 in pkgs.runCommand "check" {
   nativeBuildInputs = with pkgs; [
     expect
diff --git a/tests/jffs2/configuration.nix b/tests/jffs2/configuration.nix
index 2515fbf..ea7670b 100644
--- a/tests/jffs2/configuration.nix
+++ b/tests/jffs2/configuration.nix
@@ -5,7 +5,6 @@ in {
   imports = [
     ../../vanilla-configuration.nix
     ../../modules/squashfs.nix
-    ../../modules/outputs/jffs2.nix
   ];
   config.rootfsType = "jffs2";
   config.filesystem = dir {
diff --git a/tests/jffs2/test.nix b/tests/jffs2/test.nix
index f972583..5c5a582 100644
--- a/tests/jffs2/test.nix
+++ b/tests/jffs2/test.nix
@@ -6,7 +6,7 @@ let img = (import liminix {
       device = import "${liminix}/devices/qemu/";
       liminix-config = ./configuration.nix;
     }).outputs.vmroot;
-    pkgs = import <nixpkgs> { overlays = [(import ../../overlay.nix)]; };
+    pkgs = import nixpkgs { overlays = [(import ../../overlay.nix)]; };
 in pkgs.runCommand "check" {
   nativeBuildInputs = with pkgs; [
     expect
diff --git a/tests/min-copy-closure/configuration.nix b/tests/min-copy-closure/configuration.nix
index fe80bf2..0797341 100644
--- a/tests/min-copy-closure/configuration.nix
+++ b/tests/min-copy-closure/configuration.nix
@@ -13,7 +13,6 @@ let
 in {
   imports = [
     ../../vanilla-configuration.nix
-    ../../modules/outputs/jffs2.nix
   ];
   config =  {
     services.sshd = longrun {
diff --git a/tests/min-copy-closure/test.nix b/tests/min-copy-closure/test.nix
index 14f0225..774b882 100644
--- a/tests/min-copy-closure/test.nix
+++ b/tests/min-copy-closure/test.nix
@@ -8,7 +8,7 @@ let lmx = (import liminix {
     });
     rogue = lmx.pkgs.rogue;
     img = lmx.outputs.vmroot;
-    pkgs = import <nixpkgs> { overlays = [(import ../../overlay.nix)]; };
+    pkgs = import nixpkgs { overlays = [(import ../../overlay.nix)]; };
 in pkgs.runCommand "check" {
   nativeBuildInputs = with pkgs; [
     expect
diff --git a/tests/pppoe/test.nix b/tests/pppoe/test.nix
index c8007a9..6972256 100644
--- a/tests/pppoe/test.nix
+++ b/tests/pppoe/test.nix
@@ -6,7 +6,7 @@ let img = (import liminix {
       device = import "${liminix}/devices/qemu";
       liminix-config = ./configuration.nix;
     }).outputs.default;
-    pkgs = import <nixpkgs> { overlays = [(import ../../overlay.nix)]; };
+    pkgs = import nixpkgs { overlays = [(import ../../overlay.nix)]; };
     inherit (pkgs.pkgsBuildBuild) routeros;
 in pkgs.runCommand "check" {
   nativeBuildInputs = with pkgs; [
diff --git a/tests/tftpboot/test.nix b/tests/tftpboot/test.nix
index b7a3e87..b6b9f1a 100644
--- a/tests/tftpboot/test.nix
+++ b/tests/tftpboot/test.nix
@@ -1,5 +1,6 @@
 {
-  liminix
+  liminix,
+  ...
 }:
 let check = deviceName  : config :
 let derivation = (import liminix {
diff --git a/tests/updown/test.nix b/tests/updown/test.nix
index 589e383..45f7c91 100644
--- a/tests/updown/test.nix
+++ b/tests/updown/test.nix
@@ -6,7 +6,7 @@ let img = (import liminix {
       device = import "${liminix}/devices/qemu/";
       liminix-config = ./configuration.nix;
     }).outputs.vmroot;
-    pkgs = import <nixpkgs> { overlays = [(import ../../overlay.nix)]; };
+    pkgs = import nixpkgs { overlays = [(import ../../overlay.nix)]; };
 in pkgs.runCommand "check" {
   nativeBuildInputs = with pkgs; [
     expect
diff --git a/tests/wlan/test.nix b/tests/wlan/test.nix
index fcc2715..f644fb9 100644
--- a/tests/wlan/test.nix
+++ b/tests/wlan/test.nix
@@ -3,10 +3,10 @@
 , nixpkgs
 }:
 let img = (import liminix {
-      device = import "${liminix}/devices/qemu-armv7l/";
+      device = import "${liminix}/devices/qemu/";
       liminix-config = ./configuration.nix;
     }).outputs.default;
-    pkgs = import <nixpkgs> { overlays = [(import ../../overlay.nix)]; };
+    pkgs = import nixpkgs { overlays = [(import ../../overlay.nix)]; };
 in pkgs.runCommand "check" {
   nativeBuildInputs = with pkgs; [
     expect socat
-- 
2.47.0


From c5e48f5c9fb38c721e6d186019269324ff5662d7 Mon Sep 17 00:00:00 2001
From: catvayor <catvayor@katvayor.net>
Date: Wed, 18 Sep 2024 17:04:51 +0200
Subject: [PATCH 2/2] feat(ci-wlan): use wpa_supplicant

---
 default.nix                     |  1 +
 overlay.nix                     |  6 +++++-
 tests/wlan/configuration.nix    | 19 ++++++++++++++++++-
 tests/wlan/test.nix             |  1 +
 tests/wlan/wait-for-wlan.expect |  4 ++--
 tests/wlan/wpa_service.nix      | 21 +++++++++++++++++++++
 tests/wlan/wpa_supplicant.nix   | 15 +++++++++++++++
 7 files changed, 63 insertions(+), 4 deletions(-)
 create mode 100644 tests/wlan/wpa_service.nix
 create mode 100644 tests/wlan/wpa_supplicant.nix

diff --git a/default.nix b/default.nix
index 33593dc..fd1c357 100644
--- a/default.nix
+++ b/default.nix
@@ -27,6 +27,7 @@ let
     modules = [
       {
         nixpkgs = {
+          source = nixpkgs;
           overlays = [ overlay ];
           config.permittedInsecurePackages = [
             "python-2.7.18.8"
diff --git a/overlay.nix b/overlay.nix
index dda4ddc..891e9a0 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -194,7 +194,11 @@ extraPkgs // {
     });
   in h.override { openssl = null; sqlite = null; };
 
-
+  wpa_supplicant = prev.wpa_supplicant.override {
+    dbusSupport = false;
+    withPcsclite = false;
+    wpa_supplicant_gui = null;
+  };
 
   kexec-tools-static = prev.kexec-tools.overrideAttrs(o: {
     # For kexecboot we copy kexec into a ramdisk on the system being
diff --git a/tests/wlan/configuration.nix b/tests/wlan/configuration.nix
index 6dc4b44..ed1d948 100644
--- a/tests/wlan/configuration.nix
+++ b/tests/wlan/configuration.nix
@@ -7,6 +7,7 @@ in rec {
     ../../modules/wlan.nix
     ../../modules/hostapd
     ../../modules/network
+    ./wpa_supplicant.nix
   ];
 
   services.hostap = config.system.service.hostapd.build {
@@ -27,5 +28,21 @@ in rec {
     };
   };
 
-  defaultProfile.packages = with pkgs;  [ tcpdump ] ;
+  services.wpa_supplicant = config.system.service.wpa_supplicant.build {
+    interface = "wlan1";
+    driver = "nl80211";
+    config-file = pkgs.writeText "wpa_supplicant.conf" ''
+      country=us
+      update_config=1
+      ctrl_interface=/run/wpa_supplicant
+
+      network={
+       scan_ssid=1
+       ssid="liminix"
+       psk="colourless green ideas"
+      }
+    '';
+  };
+
+  defaultProfile.packages = with pkgs; [ tcpdump wpa_supplicant ];
 }
diff --git a/tests/wlan/test.nix b/tests/wlan/test.nix
index f644fb9..f1f20c2 100644
--- a/tests/wlan/test.nix
+++ b/tests/wlan/test.nix
@@ -3,6 +3,7 @@
 , nixpkgs
 }:
 let img = (import liminix {
+      inherit nixpkgs;
       device = import "${liminix}/devices/qemu/";
       liminix-config = ./configuration.nix;
     }).outputs.default;
diff --git a/tests/wlan/wait-for-wlan.expect b/tests/wlan/wait-for-wlan.expect
index 1d42a4e..5e0f073 100644
--- a/tests/wlan/wait-for-wlan.expect
+++ b/tests/wlan/wait-for-wlan.expect
@@ -14,10 +14,10 @@ expect {
 }
 expect "#"
 while { $FINISHED < 10 } {
-  send "date && grep AP-ENABLED /run/uncaught-logs/* || echo \$NOT\r\n"
+  send "date && grep CTRL-EVENT-CONNECTED /run/uncaught-logs/* || echo \$NOT\r\n"
   
   expect {
-    "wlan0: AP-ENABLED" { set FINISHED 999; set EXIT 0; }
+    "wlan1: CTRL-EVENT-CONNECTED" { set FINISHED 999; set EXIT 0; }
     "not_present" { send_user "waiting ...\n" ; sleep 5 }
   }
   set FINISHED [ expr $FINISHED + 1 ]
diff --git a/tests/wlan/wpa_service.nix b/tests/wlan/wpa_service.nix
new file mode 100644
index 0000000..ae70db3
--- /dev/null
+++ b/tests/wlan/wpa_service.nix
@@ -0,0 +1,21 @@
+{
+  liminix,
+  wpa_supplicant,
+  lib,
+}:
+{
+  interface,
+  driver,
+  config-file,
+}:
+let
+  inherit (liminix.services) longrun;
+  inherit (lib.strings) escapeShellArg;
+in
+longrun {
+  name = "wpa_supplicant";
+  run =
+  ''
+    ${wpa_supplicant}/bin/wpa_supplicant -D${driver} -i${interface} -c ${config-file}
+  '';
+}
diff --git a/tests/wlan/wpa_supplicant.nix b/tests/wlan/wpa_supplicant.nix
new file mode 100644
index 0000000..98f7f08
--- /dev/null
+++ b/tests/wlan/wpa_supplicant.nix
@@ -0,0 +1,15 @@
+{ config, lib, pkgs, ... }:
+with lib; {
+  options.system.service.wpa_supplicant = mkOption { type = pkgs.liminix.lib.types.serviceDefn; };
+  config.system.service.wpa_supplicant = config.system.callService ./wpa_service.nix {
+    interface = mkOption {
+      type = types.str;
+    };
+    driver = mkOption {
+      type = types.str;
+    };
+    config-file = mkOption {
+      type = types.package;
+    };
+  };
+}
-- 
2.47.0