usteer: init at unstable-04-09-2024

Signed-off-by: Raito Bezarius <masterancpp@gmail.com>

ci.nix

@@ -1,15 +1,21 @@
 {
-  sources ? import ./lon.nix
+  nixpkgs
-, nixpkgs ? sources.nixpkgs
+, unstable
-, unstable ? nixpkgs
+, liminix
-, liminix ? ./.
 , ... }:
 let
-  pkgs = (import nixpkgs { });
+  inherit (builtins) map;
+  pkgs = (import nixpkgs {});
   borderVmConf =  ./bordervm.conf-example.nix;
   inherit (pkgs.lib.attrsets) genAttrs;
   devices = [
+    "gl-ar750"
+    "gl-mt300a"
+    "gl-mt300n-v2"
     "qemu"
+    "qemu-aarch64"
+    "qemu-armv7l"
+    "tp-archer-ax23"
     "zyxel-nwa50ax"
   ];
   vanilla = ./vanilla-configuration.nix;
@@ -38,6 +44,12 @@ let
                   imports = [ ./modules/all-modules.nix ];
                 };
               }).outputs.optionsJson;
+            installers = map (f: "system.outputs.${f}") [
+              "vmroot"
+              "mtdimage"
+              "ubimage"
+            ];
+            inherit (pkgs.lib) concatStringsSep;
         in pkgs.stdenv.mkDerivation {
           name = "liminix-doc";
           nativeBuildInputs = with pkgs; [

devices/qemu/default.nix

@@ -1,7 +1,7 @@
 # This "device" generates images that can be used with the QEMU
 # emulator. The default output is a directory containing separate
 # kernel (uncompressed vmlinux) and initrd (squashfs) images
-rec {
+{
   system = {
     crossSystem = {
       config = "mips-unknown-linux-musl";
@@ -41,9 +41,6 @@ rec {
       ../../modules/arch/mipseb.nix
       ../families/qemu.nix
     ];
-
-    nixpkgs.hostPlatform = system.crossSystem;
-
     kernel = {
       config = {
         MIPS_MALTA= "y";

devices/zyxel-nwa50ax/default.nix

@@ -1,4 +1,4 @@
-rec {
+{
   system = {
     crossSystem = {
       config = "mipsel-unknown-linux-musl";
@@ -135,8 +135,6 @@ rec {
         ../../modules/zyxel-dual-image
       ];
 
-      nixpkgs.hostPlatform = system.crossSystem;
-
       filesystem = dir {
         lib = dir {
           firmware = dir {
@@ -224,8 +222,8 @@ rec {
 
         imageFormat = "fit";
         tftp = {
-          # 20MB is pretty good on this device as we have plenty of RAM.
+          # 5MB is nice.
-          freeSpaceBytes = 20 * 1024 * 1024;
+          freeSpaceBytes = 5 * 1024 * 1024;
           appendDTB = true;
           loadAddress = lim.parseInt "0x2000000";
         };

lib/eval-config.nix

@@ -1,4 +1,4 @@
-{ nixpkgs ? <nixpkgs>, pkgs ? (import nixpkgs {}), lib ? pkgs.lib }:
+{ nixpkgs ? <nixpkgs>, pkgs ? (import <nixpkgs> {}), lib ? pkgs.lib }:
 args:
 let
   modulesPath = builtins.toString ../modules;

lon.lock

@@ -1,15 +0,0 @@
-{
-  "version": "1",
-  "sources": {
-    "nixpkgs": {
-      "type": "GitHub",
-      "fetchType": "tarball",
-      "owner": "nixos",
-      "repo": "nixpkgs",
-      "branch": "nixos-unstable-small",
-      "revision": "b6227cadb5123c7e4cb159bf6f9f5705ae081a47",
-      "url": "https://github.com/nixos/nixpkgs/archive/b6227cadb5123c7e4cb159bf6f9f5705ae081a47.tar.gz",
-      "hash": "sha256-KFR30GNFhjzXl0kVEn+KK4xrFr0gggb1NBroP8ukbxY="
-    }
-  }
-}

lon.nix

@@ -1,41 +0,0 @@
-# Generated by lon. Do not modify!
-let
-
-  lock = builtins.fromJSON (builtins.readFile ./lon.lock);
-
-  # Override with a path defined in an environment variable. If no variable is
-  # set, the original path is used.
-  overrideFromEnv =
-    name: path:
-    let
-      replacement = builtins.getEnv "LON_OVERRIDE_${name}";
-    in
-    if replacement == "" then
-      path
-    else
-    # this turns the string into an actual Nix path (for both absolute and
-    # relative paths)
-    if builtins.substring 0 1 replacement == "/" then
-      /. + replacement
-    else
-      /. + builtins.getEnv "PWD" + "/${replacement}";
-
-  fetchSource =
-    args@{ fetchType, ... }:
-    if fetchType == "git" then
-      builtins.fetchGit {
-        url = args.url;
-        ref = args.branch;
-        rev = args.revision;
-        narHash = args.hash;
-      }
-    else if fetchType == "tarball" then
-      builtins.fetchTarball {
-        url = args.url;
-        sha256 = args.hash;
-      }
-    else
-      builtins.throw "Unsupported source type ${fetchType}";
-
-in
-builtins.mapAttrs (name: args: overrideFromEnv name (fetchSource args)) lock.sources

modules/base.nix

@@ -69,14 +69,6 @@ in {
         default = "uimage";
       };
       tftp = {
-        commandLine = mkOption {
-          type = types.listOf types.str;
-          default = config.boot.commandLine;
-          description = ''
-            TFTP-specific command line.
-            Defaults to the classical one if unset.
-          '';
-        };
         loadAddress = mkOption {
           type = types.ints.unsigned;
           description = ''
@@ -105,13 +97,7 @@ in {
       };
     };
   };
-
-  imports = [ ./nixpkgs.nix ];
-
   config = {
-    # By default, we enable cross-compilation support.
-    nixpkgs.buildPlatform = lib.mkDefault builtins.currentSystem;
-
     defaultProfile.packages = with pkgs;
       [ s6 s6-init-bin execline s6-linux-init s6-rc ];
 

modules/bridge/default.nix

@@ -43,20 +43,8 @@ in
       };
 
       members = mkOption {
-        type = types.attrsOf (types.submodule ({ ... }: { options = {
+        type = types.listOf liminix.lib.types.interface;
-          member = mkOption {
+        description = "interfaces to add to the bridge";
-            type = liminix.lib.types.interface;
-            description = "interface to add";
-          };
-
-          dependencies = mkOption {
-            type = types.listOf liminix.lib.types.service;
-            default = [];
-            description = "extra dependencies before attaching this interface to the bridge";
-          };
-        }; }));
-
-        description = "set of bridge members";
       };
     };
 

modules/bridge/members.nix

@@ -7,10 +7,11 @@
 { members, primary } :
 
 let
-  inherit (liminix.services) structuredBundle oneshot;
+  inherit (liminix.networking) interface;
-  inherit (lib) mapAttrs;
+  inherit (liminix.services) bundle oneshot;
-  addif = name: { dependencies ? [ ], member }: oneshot {
+  inherit (lib) mkOption types;
-    name = "${primary.name}.member.${name}";
+  addif = member : oneshot {
+    name = "${primary.name}.member.${member.name}";
     up = ''
       echo "attaching $(output ${member} ifname) to $(output ${primary} ifname) bridge"
       ip link set dev $(output ${member} ifname) master $(output ${primary} ifname)
@@ -20,9 +21,9 @@ let
       ip link set dev $(output ${member} ifname) nomaster
     '';
 
-    dependencies = [ primary member ] ++ dependencies;
+    dependencies = [ primary member ];
   };
-in structuredBundle {
+in bundle {
   name = "${primary.name}.members";
-  contents = mapAttrs addif members;
+  contents = map addif members;
 }

modules/hostapd/default.nix

@@ -20,10 +20,6 @@ in {
     system.service.hostapd = mkOption {
       type = liminix.lib.types.serviceDefn;
     };
-
-    system.service.hostapd-ready = mkOption {
-      type = liminix.lib.types.serviceDefn;
-    };
   };
   config = {
     system.service.hostapd = liminix.callService ./service.nix {
@@ -38,12 +34,5 @@ in {
         type = types.attrs;
       };
     };
-
-    system.service.hostapd-ready = liminix.callService ./ready.nix {
-      interface = mkOption {
-        type = liminix.lib.types.interface;
-        description = "Interface for which to wait that the oper state Master or Master (VLAN) has been reached.";
-      };
-    };
   };
 }

modules/hostapd/ready.nix

@@ -1,16 +0,0 @@
-{
-  liminix
-, ifwait
-, lib
-}:
-{ interface } :
-let
-  inherit (liminix.services) oneshot;
-in oneshot {
-  name = "${interface.name}.wlan-oper";
-  up = ''
-    ${ifwait}/bin/ifbridgeable -v $(output ${interface} ifname)
-  '';
-
-  dependencies = [ interface ];
-}

modules/hostname.nix

@@ -15,7 +15,7 @@ in {
   };
   config = {
     services.hostname = oneshot {
-      name = "hostname-${builtins.substring 0 12 (builtins.hashString "sha256" config.hostname)}";
+      name = "hostname";
       up = "echo ${config.hostname} > /proc/sys/kernel/hostname";
       down = "true";
     };

modules/nixpkgs.nix

@@ -83,11 +83,11 @@ let
               localSystem = cfg.hostPlatform;
             };
       in
-      import cfg.source ({
+      import <nixpkgs> ({
         inherit (cfg) config overlays;
       } // systemArgs)
     else
-      import cfg.source {
+      import <nixpkgs> {
         inherit (cfg) config overlays localSystem crossSystem;
       };
 
@@ -97,14 +97,6 @@ in
 
 {
   options.nixpkgs = {
-    source = mkOption {
-      type = types.package // {
-        description = "Source of a nixpkgs repository";
-      };
-
-      default = <nixpkgs>;
-      defaultText = "<nixpkgs>";
-    };
 
     pkgs = mkOption {
       defaultText = literalExpression ''
@@ -331,8 +323,6 @@ in
     };
   };
 
-  imports = [ ./misc/assertions.nix ];
-
   config = {
     _module.args = {
       pkgs =

modules/outputs/initramfs.nix

@@ -13,14 +13,6 @@ in
     boot.initramfs = {
       enable = mkEnableOption "initramfs";
     };
-    system.build.toplevel = mkOption {
-        type = types.package;
-        description = ''
-          pkgs.systemconfig for the configured filesystem,
-          contains 'activate' and 'init' commands
-        '';
-        internal = true;
-    };
     system.outputs = {
       initramfs = mkOption {
         type = types.package;
@@ -44,45 +36,22 @@ in
     kernel.config = {
       BLK_DEV_INITRD = "y";
       INITRAMFS_SOURCE = builtins.toJSON "${config.system.outputs.initramfs}";
-      INITRAMFS_COMPRESSION_ZSTD = "y";
+#      INITRAMFS_COMPRESSION_LZO = "y";
     };
 
-    system.build.toplevel = config.system.outputs.systemConfiguration;
-
     system.outputs = {
       initramfs =
-        let
+        let inherit (pkgs.pkgsBuildBuild) gen_init_cpio;
-          inherit (pkgs.pkgsBuildBuild) gen_init_cpio cpio writeScript;
-          inherit (pkgs) busybox;
-          failsafe-init = writeScript "init" ''
-            #!/bin/sh
-            exec >/dev/console
-            echo Running in initramfs
-            PATH=${busybox}/bin:$PATH
-            export PATH
-            mount -t proc none /proc
-            mount -t sysfs none /sys
-            ${busybox}/bin/sh
-          '';
-          refs = pkgs.writeReferencesToFile busybox;
         in runCommand "initramfs.cpio" {} ''
-          cat << SPECIALS | ${gen_init_cpio}/bin/gen_init_cpio /dev/stdin > out
+          cat << SPECIALS | ${gen_init_cpio}/bin/gen_init_cpio /dev/stdin > $out
           dir /proc 0755 0 0
           dir /dev 0755 0 0
           nod /dev/console 0600 0 0 c 5 1
           dir /target 0755 0 0
           dir /target/persist 0755 0 0
           dir /target/nix 0755 0 0
-          dir /nix 0755 0 0
-          dir /nix/store 0755 0 0
-          dir /bin 0755 0 0
-          file /bin/sh  ${busybox}/bin/sh 0755 0 0
           file /init ${pkgs.preinit}/bin/preinit 0755 0 0
-          file /failsafe-init ${failsafe-init} 0755 0 0
           SPECIALS
-
-          find $(cat ${refs}) | ${cpio}/bin/cpio -H newc -o -A -v -O out
-          mv out $out
         '';
       systemConfiguration =
         pkgs.systemconfig config.filesystem.contents;

modules/outputs/tftpboot.nix

@@ -12,15 +12,10 @@ let
   arch = pkgs.stdenv.hostPlatform.linuxArch;
 
   # UBI cannot run on the top of phram.
-  needsJffs2 = config.rootfsType == "ubifs";
+  needsSquashfs = config.rootfsType == "ubifs";
-  # squashfs doesn't work out for us because only `bootablerootdir`
+  rootfstype = if needsSquashfs then "squashfs" else config.rootfsType;
-  # contain what we need to boot, not `config.filesystem.contents` alas.
+  rootfs = if needsSquashfs then
-  rootfstype = if needsJffs2 then "jffs2" else config.rootfsType;
+    liminix.builders.squashfs config.filesystem.contents
-  rootfs = if needsJffs2 then
-  liminix.builders.jffs2 {
-    bootableRootDirectory = config.system.outputs.bootablerootdir;
-    inherit (config.hardware.flash) eraseBlockSize;
-  }
   else config.system.outputs.rootfs;
 in {
   imports = [ ../ramdisk.nix ];
@@ -41,6 +36,14 @@ in {
       type = types.bool;
       default = false;
     };
+    commandLine = mkOption {
+      type = types.listOf types.str;
+      default = config.boot.commandLine;
+      description = ''
+        TFTP-specific command line.
+        Defaults to the classical one if unset.
+      '';
+    };
   };
   options.system.outputs = {
     tftpboot = mkOption {
@@ -79,13 +82,9 @@ in {
   config = {
     boot.ramdisk.enable = true;
 
-    kernel.config = mkIf needsJffs2 {
+    kernel.config = mkIf needsSquashfs {
-      JFFS2_FS = "y";
+      SQUASHFS = "y";
-      JFFS2_LZO = "y";
+      SQUASHFS_XZ = "y";
-      JFFS2_RTIME = "y";
-      JFFS2_COMPRESSION_OPTIONS = "y";
-      JFFS2_ZLIB = "y";
-      JFFS2_CMODE_SIZE = "y";
     };
 
     system.outputs = rec {

modules/ubus/default.nix

@@ -1,24 +0,0 @@
-## ubus
-## ====
-##
-## ubus is a micro-bus à la D-Bus for all your needs.
-
-{ lib, pkgs, config, ...}:
-let
-  inherit (lib) mkOption types;
-  inherit (pkgs) liminix;
-in {
-  options = {
-    system.service.ubus = mkOption {
-      type = liminix.lib.types.serviceDefn;
-    };
-  };
-  config = {
-    system.service.ubus = liminix.callService ./service.nix {
-      package = mkOption {
-        type = types.package;
-        default = pkgs.ubus;
-      };
-    };
-  };
-}

modules/ubus/service.nix

@@ -1,16 +0,0 @@
-{
-  liminix
-, writeText
-, lib
-}:
-{ package } :
-let
-  inherit (liminix.services) longrun;
-in longrun {
-  # Long term: make it unique so that user can spawn multiple buses if they want.
-  name = "ubus";
-  run = ''
-    mkdir -p /run/ubus
-    ${package}/bin/ubusd -s /run/ubus/ubus.sock
-  '';
-}

overlay.nix

@@ -1,24 +1,23 @@
 final: prev:
 let
-  isCross = final.stdenv.buildPlatform != final.stdenv.hostPlatform;
-  crossOnly = pkg : amendFn : if isCross then (amendFn pkg) else pkg;
   extraPkgs = import ./pkgs/default.nix {
     inherit (final) lib callPackage;
   };
   inherit (final) fetchpatch;
-  luaHost = prev.lua5_3.overrideAttrs(o: {
+  lua_no_readline = prev.lua5_3;
-     name = "lua-tty";
+#   lua_no_readline = prev.lua5_3.overrideAttrs(o: {
-     preBuild = ''
+#     name = "lua-tty";
-       makeFlagsArray+=(PLAT="posix" SYSLIBS="-Wl,-E -ldl"  CFLAGS="-O2 -fPIC -DLUA_USE_POSIX -DLUA_USE_DLOPEN")
+#     preBuild = ''
-     '';
+#       makeFlagsArray+=(PLAT="posix" SYSLIBS="-Wl,-E -ldl"  CFLAGS="-O2 -fPIC -DLUA_USE_POSIX -DLUA_USE_DLOPEN")
-     # lua in nixpkgs has a postInstall stanza that assumes only
+#     '';
-     # one output, we need to override that if we're going to
+#     # lua in nixpkgs has a postInstall stanza that assumes only
-     # convert to multi-output
+#     # one output, we need to override that if we're going to
-     # outputs = ["bin" "man" "out"];
+#     # convert to multi-output
-     makeFlags =
+#     # outputs = ["bin" "man" "out"];
-       builtins.filter (x: (builtins.match "(PLAT|MYLIBS).*" x) == null)
+#     makeFlags =
-         o.makeFlags;
+#       builtins.filter (x: (builtins.match "(PLAT|MYLIBS).*" x) == null)
-   });
+#         o.makeFlags;
+#   });
 
   s6 = prev.s6.overrideAttrs(o:
     let
@@ -43,6 +42,7 @@ let
         (if o ? patches then o.patches else []) ++
         (if patch_needed then [ patch ] else []);
     });
+  lua = let s = lua_no_readline.override { self = s; }; in s;
 in
 extraPkgs // {
   # liminix library functions
@@ -130,18 +130,9 @@ extraPkgs // {
         "CONFIG_LIBNL32=y"
         "CONFIG_PKCS12=y"
         "CONFIG_RSN_PREAUTH=y"
-        "CONFIG_UBUS=y"
         "CONFIG_TLS=internal"
       ];
       h = prev.hostapd.overrideAttrs(o: {
-        buildInputs = o.buildInputs ++ [ final.libubox final.ubus ];
-        src = final.fetchFromGitea {
-           domain = "git.dgnum.eu";
-           owner = "DGNum";
-           repo = "hostapd";
-           rev = "hostap-liminix-integration";
-           hash = "sha256-5Xi90keCHxvuKR5Q7STuZDzuM9h9ac6aWoXVQYvqkQI=";
-        };
         extraConfig = "";
         configurePhase = ''
           cat > hostapd/defconfig <<EOF
@@ -172,18 +163,10 @@ extraPkgs // {
       "CONFIG_LIBNL32=y"
       "CONFIG_PKCS12=y"
       "CONFIG_RSN_PREAUTH=y"
-      "CONFIG_UBUS=y"
+      # Required to read the key material for RADIUS.
-      "CONFIG_TLS=internal"
+      "CONFIG_TLS=openssl"
     ];
     h = prev.hostapd.overrideAttrs(o: {
-      buildInputs = o.buildInputs ++ [ final.libubox final.ubus ];
-        src = final.fetchFromGitea {
-           domain = "git.dgnum.eu";
-           owner = "DGNum";
-           repo = "hostapd";
-           rev = "hostap-liminix-integration";
-           hash = "sha256-5Xi90keCHxvuKR5Q7STuZDzuM9h9ac6aWoXVQYvqkQI=";
-      };
       extraConfig = "";
       configurePhase = ''
         cat > hostapd/defconfig <<EOF
@@ -192,7 +175,7 @@ extraPkgs // {
         ${o.configurePhase}
       '';
     });
-  in h.override { openssl = null; sqlite = null; };
+  in h.override { sqlite = null; };
 
 
 
@@ -214,7 +197,8 @@ extraPkgs // {
     ];
   });
 
-  lua = crossOnly prev.lua5_3 (_: luaHost);
+  luaFull = prev.lua;
+  inherit lua;
 
   mtdutils = prev.mtdutils.overrideAttrs(o: {
     patches = (if o ? patches then o.patches else []) ++ [

pkgs/anoia/Makefile

@@ -1,5 +1,5 @@
 
-default: wlan.lua fs.lua init.lua nl.lua svc.lua net/constants.lua
+default: fs.lua init.lua nl.lua svc.lua net/constants.lua
 
 test:
 	ln -s . anoia

pkgs/anoia/default.nix

@@ -4,7 +4,6 @@
 , linotify
 , lua
 , lualinux
-, iwinfo
 , cpio
 }:
 let pname =  "anoia";
@@ -13,7 +12,7 @@ in stdenv.mkDerivation {
   version = "0.1";
   src = ./.;
   nativeBuildInputs = [ fennel cpio ];
-  buildInputs = with lua.pkgs; [ linotify lualinux iwinfo ];
+  buildInputs = with lua.pkgs; [ linotify lualinux ];
   outputs = [ "out" "dev" ];
 
   doCheck = true;

pkgs/anoia/wlan.fnl

@@ -1,8 +0,0 @@
-(local { : nl80211 } (require :iwinfo))
-
-(fn is-bridgeable [ifname]
-  (let [mode (nl80211.mode ifname)]
-    (or (= mode "Master") (= mode "Master (VLAN)"))
-))
-
-{ : is-bridgeable }

pkgs/default.nix

@@ -112,7 +112,7 @@ in {
   tufted = callPackage ./tufted {};
   libubox = callPackage ./libubox {};
   ubus = callPackage ./ubus {};
-  iwinfo = callPackage ./iwinfo {};
+  usteer = callPackage ./usteer {};
   uevent-watch = callPackage ./uevent-watch {};
   usb-modeswitch = callPackage ./usb-modeswitch {};
   writeAshScript = callPackage ./write-ash-script {};

pkgs/fennelrepl/default.nix

@@ -10,7 +10,6 @@
 , linotify
 , anoia
 , netlink-lua
-, iwinfo
 , fennel
 }:
 let packages = [
@@ -19,7 +18,7 @@ let packages = [
       fennel
       lualinux
       netlink-lua
-      iwinfo
+      lua.pkgs.readline
     ];
     join = ps: builtins.concatStringsSep ";" ps;
     luapath = join (builtins.map (f:

pkgs/ifwait/default.nix

@@ -1,14 +1,11 @@
 {
   lua
 , netlink-lua
-, lualinux
-, iwinfo
 , writeFennelScript
 , runCommand
 , anoia
 }:
 runCommand "ifwait" {} ''
   mkdir -p $out/bin
-  cp -p ${writeFennelScript "ifwait" [ anoia netlink-lua ] ./ifwait.fnl} $out/bin/ifwait
+  cp -p ${writeFennelScript "ifwait" [anoia netlink-lua] ./ifwait.fnl} $out/bin/ifwait
-  cp -p ${writeFennelScript "ifbridgeable" [ anoia lualinux iwinfo ] ./ifbridgeable.fnl} $out/bin/ifbridgeable
 ''

pkgs/ifwait/ifbridgeable.fnl

@@ -1,30 +0,0 @@
-(local wlan (require :anoia.wlan))
-(local { : assoc } (require :anoia))
-(local { : msleep } (require :lualinux))
-
-(fn parse-args [args]
-  (match args
-    ["-v" & rest]  (assoc (parse-args rest) :verbose true)
-    [linkname] {:link linkname}
-    _  nil))
-
-(fn run [args poll-fn]
-  (let [parameters
-        (assert (parse-args args)
-                (.. "Usage: ifbridgeable [-v] ifname"))]
-    (when parameters.verbose
-      (print (.. "ifbridgeable: waiting for "
-                 parameters.link " to be bridgeable")))
-
-    (while (not (poll-fn parameters.link))
-      (when parameters.verbose
-        (print (.. "ifbridgeable: waiting for " parameters.link " to be bridgeable")))
-      (msleep 500)
-    )
-  )
-)
-
-(when (not (= (. arg 0) "test"))
-  (run arg wlan.is-bridgeable))
-
-{ : run  }

pkgs/iwinfo/default.nix

@@ -1,59 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitea,
-  ubus,
-  libubox,
-  lua5_3,
-  libnl-tiny,
-  backend ? "nl80211"
-}:
-let
-  lua = lua5_3;
-in
-stdenv.mkDerivation rec {
-  pname = "iwinfo";
-  version = "unstable-07-09-2024";
-
-  src = fetchFromGitea {
-    domain = "git.dgnum.eu";
-    owner = "DGNum";
-    repo = "iwinfo";
-    rev = "14685a26805155aa5c137993b9a4861a0bc585d5";
-    hash = "sha256-lg4sBoYcFFLhcUv+wKR6u1OCartjtnAoF9M5FdfO6JE=";
-  };
-
-  BACKENDS = backend;
-
-  buildInputs = [
-    ubus
-    libubox
-    lua
-    libnl-tiny
-  ];
-
-  CFLAGS = "-I${libnl-tiny}/include/libnl-tiny -D_GNU_SOURCE";
-
-  installPhase = ''
-    runHook preInstall
-
-    install -Dm755 iwinfo $out/bin/iwinfo
-    install -Dm755 iwinfo.so $out/lib/lua/${lua.luaversion}/iwinfo.so
-    install -Dm755 libiwinfo.so $out/lib/libiwinfo.so
-    install -Dm755 libiwinfo.so.0 $out/lib/libiwinfo.so.0
-
-    mkdir -p $out/include
-    cp -r include/* $out/include
-
-    runHook postInstall
-  '';
-
-  meta = {
-    description = "Library to access wireless devices";
-    homepage = "https://github.com/openwrt/iwinfo";
-    license = lib.licenses.gpl2Only;
-    maintainers = with lib.maintainers; [ raitobezarius ];
-    mainProgram = "iwinfo";
-    platforms = lib.platforms.all;
-  };
-}

pkgs/kernel/default.nix

@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [buildPackages.stdenv.cc] ++
                       (with buildPackages.pkgs; [
                         rsync bc bison flex pkg-config
-                        openssl ncurses.all perl zstd
+                        openssl ncurses.all perl
                       ]);
   CC = "${stdenv.cc.bintools.targetPrefix}gcc";
   HOSTCC = with buildPackages.pkgs;

pkgs/libubox/default.nix

@@ -1,9 +1,9 @@
 {
   lib,
   stdenv,
-  fetchFromGitea,
+  fetchgit,
   cmake,
-  lua,
+  lua5_1,
   json_c
 }:
 
@@ -11,32 +11,29 @@ stdenv.mkDerivation rec {
   pname = "libubox";
   version = "unstable-2024-04-09";
 
-  src = fetchFromGitea {
+  src = fetchgit {
-    domain = "git.dgnum.eu";
+    url = "https://git.openwrt.org/project/libubox.git";
-    owner = "DGNum";
+    rev = "eb9bcb64185ac155c02cc1a604692c4b00368324";
-    repo = "libubox";
+    hash = "sha256-5KO2E+4pcDp/pe2+vjoQDmyMwCc0yKm847U4J6HjxyA=";
-    rev = "1c4b2dc4c12848e1b70b11e1cb2139ca8f19c860";
-    hash = "sha256-aPhGJ7viXQmnoQRY8DuRvtwtxSy+S4qPj1fBsK066Yc=";
   };
 
   nativeBuildInputs = [
     cmake
-    lua
+    lua5_1
   ];
 
   buildInputs = [
-    lua
+    lua5_1
     json_c
   ];
 
   # Otherwise, CMake cannot find jsoncpp?
-  env.NIX_CFLAGS_COMPILE = toString [ "-I${json_c.dev}/include/json-c" "-D JSONC" "-D LUA_COMPAT_MODULE" ];
+  env.NIX_CFLAGS_COMPILE = toString [ "-I${json_c.dev}/include/json-c" "-D JSONC" ];
 
   cmakeFlags = [
     "-DBUILD_EXAMPLES=off"
     # TODO: it explode at install phase.
-    "-DBUILD_LUA=on"
+    "-DBUILD_LUA=off"
-    "-DLUAPATH=${placeholder "out"}/lib/lua/${lua.luaversion}/"
   ];
 
   meta = {

pkgs/liminix-tools/services/default.nix

@@ -39,7 +39,6 @@ let
     , contents ? []
     , buildInputs ? []
     , isTrigger ? false
-    , passthru ? {}
   } @ args:
     stdenvNoCC.mkDerivation {
       # we use stdenvNoCC to avoid generating derivations with names
@@ -51,8 +50,6 @@ let
       dependencies = builtins.map (d: d.name) dependencies;
       contents = builtins.map (d: d.name) contents;
       builder = ./builder.sh;
-
-      inherit passthru;
     };
 
   longrun = {
@@ -103,18 +100,7 @@ let
     serviceType = "bundle";
     inherit contents dependencies;
   });
-  structuredBundle = {
-    name
-    , contents ? {}
-    , dependencies ? []
-    , ...
-  } @ args: service (args // {
-    serviceType = "bundle";
-    contents = builtins.attrValues contents;
-    inherit dependencies;
-    passthru.components = contents;
-  });
   target = bundle;
 in {
-  inherit target bundle oneshot longrun output structuredBundle;
+  inherit target bundle oneshot longrun output;
 }

pkgs/min-copy-closure/liminix-rebuild.sh

@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-set -Eeuo pipefail
 
 ssh_command=${SSH_COMMAND-ssh}
 
@@ -14,24 +13,19 @@ case "$1" in
 	reboot="soft"
 	shift
 	;;
-    "--root")
-	root_prefix="$2"
-	shift
-	shift
-	;;
 esac
 
 target_host=$1
 shift
 
 if [ -z "$target_host" ] ; then
-    echo Usage: liminix-rebuild \[--no-reboot\] \[--fast\] target-host params
+    echo Usage: liminix-rebuild \[--no-reboot\] target-host params
     exit 1
 fi
 
 if toplevel=$(nix-build "$@" -A outputs.systemConfiguration --no-out-link); then
     echo systemConfiguration $toplevel
-    min-copy-closure --root "$root_prefix" $target_host $toplevel
+    min-copy-closure $target_host $toplevel
     $ssh_command $target_host $toplevel/bin/install
     case "$reboot" in
 	reboot)

pkgs/preinit/preinit.c

@@ -4,13 +4,9 @@
 #include <fcntl.h>
 #include <sys/mount.h>
 #include <sys/wait.h>
-#include <sys/stat.h>
 #include <string.h>
 #include <stdint.h>
 #include <errno.h>
-#include <stdio.h>
-
-#include <dirent.h>
 
 #include <asm/setup.h>		/* for COMMAND_LINE_SIZE */
 
@@ -48,25 +44,6 @@ static int fork_exec(char * command, char *args[])
 	return execve(command, args, NULL);
 }
 
-static void debug_listdir(const char * path)
-{
-    DIR *mydir;
-    struct dirent *myfile;
-    struct stat mystat;
-
-    char buf[512];
-    mydir = opendir(path);
-    while((myfile = readdir(mydir)) != NULL)
-    {
-        sprintf(buf, "%s/%s", path, myfile->d_name);
-        stat(buf, &mystat);
-        printf("%llu", mystat.st_size);
-        printf(" %s\n", myfile->d_name);
-    }
-    closedir(mydir);
-
-}
-
 char banner[]  = "Running pre-init...\n";
 char buf[COMMAND_LINE_SIZE];
 
@@ -121,7 +98,6 @@ int main(int argc, char *argv[], char *envp[])
 	    AVER(mount(opts.device, "/target/persist", opts.fstype, 0, opts.mount_opts));
 	} else {
 	    if(mount(opts.device, "/target/persist", opts.fstype, 0, opts.mount_opts) < 0) {
-		ERR("failed to mount primary device, mount the alternative device\n");
 		AVER(mount(opts.altdevice, "/target/persist", opts.fstype, 0, opts.mount_opts));
 	    }
 	}
@@ -131,12 +107,7 @@ int main(int argc, char *argv[], char *envp[])
 		   "bind", MS_BIND, NULL));
 
 	char *exec_args[] = { "activate",  "/target", NULL };
-	if (fork_exec("/target/persist/activate", exec_args) < 0) {
+	AVER(fork_exec("/target/persist/activate", exec_args));
-	    ERR("failed to activate the system\n");
-	    pr_u32(errno); ERR ( " - "); ERR(strerror(errno)); ERR("\n");
-	    goto failsafe;
-	}
-
 	AVER(chdir("/target"));
 
 	AVER(mount("/target", "/", "bind", MS_BIND | MS_REC, NULL));
@@ -147,23 +118,5 @@ int main(int argc, char *argv[], char *envp[])
 
 	AVER(execve("/persist/init", argv, envp));
     }
-
-failsafe:
-    debug_listdir("/");
-    debug_listdir("/target");
-
-    ERR("failed to mount the rootfs\n");
-    ERR("final stand using the failsafe initialization method\n");
-    ERR("the boot process is manual from now on\n");
-
-    argv[0] = "init";
-    argv[1] = NULL;
-    // Attempt to unmount the /target mount-bind.
-    AVER(umount("/target"));
-    AVER(execve("/failsafe-init", argv, envp));
-
-    debug_listdir("/");
-    debug_listdir("/target");
-
     die();
 }

pkgs/run-liminix-vm/default.nix

@@ -2,15 +2,14 @@
   qemuLim
 , socat
 , writeShellScript
+, writeFennel
 , runCommand
-, fennel
 , lib
 , lua
 , pkgsBuildBuild
 }: let
-  writeFennel = pkgsBuildBuild.writeFennel.override { inherit lua; };
+  run-liminix-vm = pkgsBuildBuild.writeFennel "run-liminix-vm" {
-  run-liminix-vm = writeFennel "run-liminix-vm" {
+    packages = [ qemuLim pkgsBuildBuild.lua.pkgs.luaposix pkgsBuildBuild.lua.pkgs.fennel ];
-    packages = [ qemuLim lua.pkgs.luaposix fennel ];
   } ./run-liminix-vm.fnl;
   connect = writeShellScript "connect-vm" ''
     export PATH="${lib.makeBinPath [socat]}:$PATH"

pkgs/ubus/default.nix

@@ -1,35 +1,26 @@
-{ stdenv, fetchFromGitea, lib, cmake, libubox, json_c, lua, defaultSocketLocation ? "/run/ubus/ubus.sock" }:
+{ stdenv, lib, fetchFromGitHub, cmake, libubox, json_c }:
 stdenv.mkDerivation {
   pname = "ubus";
   version = "unstable-04-09-2024";
 
-  src = fetchFromGitea {
+  src = fetchFromGitHub {
-    domain = "git.dgnum.eu";
+    owner = "openwrt";
-    owner = "DGNum";
     repo = "ubus";
-    rev = "ebb1dc92e4985538a8e18b7e926264118138f281";
+    rev = "65bb027054def3b94a977229fd6ad62ddd32345b";
-    hash = "sha256-fo4zleC9R6uzlcOJ/jQ0t0nSBHUAq/uqPVd9xJdkAM0=";
+    hash = "sha256-n82Ub0IiuvWbnlDCoN+0hjo/1PbplEbc56kuOYMrHxQ=";
   };
 
-  # We don't use /var/run/ in Liminix by default.
-  postPatch = ''
-    substituteInPlace CMakeLists.txt \
-      --replace-fail "/var/run/ubus/ubus.sock" "${defaultSocketLocation}"
-  '';
-
   nativeBuildInputs = [
     cmake
   ];
 
   buildInputs = [
-    lua
     libubox
     json_c
   ];
 
   cmakeFlags = [
-    "-DBUILD_LUA=on"
+    "-DBUILD_LUA=off"
-    "-DLUAPATH=${placeholder "out"}/lib/lua/${lua.luaversion}"
     "-DBUILD_EXAMPLES=off"
   ];
 }

pkgs/usteer/default.nix

@@ -0,0 +1,36 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  json_c,
+  libpcap,
+  libubox,
+  ubus,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "usteer";
+  version = "unstable-04-09-2024";
+
+  src = fetchFromGitHub {
+    owner = "openwrt";
+    repo = "usteer";
+    rev = "e218150979b40a1b3c59ad0aaa3bbb943814db1e";
+    hash = "sha256-shbN5Wp7m/olr0OcckcPk11yXnJxpnllXqi/bw+X7gM=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  buildInputs = [ ubus libpcap libubox json_c ];
+
+  meta = {
+    description = "";
+    homepage = "https://github.com/openwrt/usteer";
+    maintainers = with lib.maintainers; [ raitobezarius ];
+    mainProgram = "usteer";
+    platforms = lib.platforms.all;
+  };
+}

pkgs/write-fennel/default.nix

@@ -27,7 +27,7 @@ name :
        echo "#!${lua}/bin/lua ${luaFlags}"
        echo "package.path = ${lib.strings.escapeShellArg (builtins.concatStringsSep "" luapath)} .. package.path"
        echo "package.cpath = ${lib.strings.escapeShellArg (builtins.concatStringsSep "" luacpath)} .. package.cpath"
-       echo "local ok, stdlib = pcall(require,'posix.stdlib'); if ok then stdlib.setenv('PATH', \"${lib.makeBinPath packages}\" .. \":\" .. os.getenv('PATH')) end"
+       echo "local ok, stdlib = pcall(require,'posix.stdlib'); if ok then stdlib.setenv('PATH',${lib.escapeShellArg (lib.makeBinPath packages)} .. \":\" .. os.getenv('PATH')) end"
        fennel ${if correlate then "--correlate" else ""} --compile ${source}
       ) >  ${name}.lua
     '';