remove unused arg

in case we miss a message, check the directory every 5s
anyway

modules/dhcp6c/acquire-wan-address.nix

@@ -3,7 +3,6 @@
 , linotify
 , anoia
 , lualinux
-, lua
 }:
 writeFennel "acquire-wan-address" {
   packages = [ linotify anoia lualinux ];

overlay.nix

@@ -113,6 +113,21 @@ extraPkgs // {
     '';
   });
 
+  elfutils =
+    let native = (with final.stdenv; (buildPlatform == hostPlatform));
+    in if native
+       then prev.elfutils
+       else
+         let
+           e = prev.elfutils.overrideAttrs(o: {
+             configureFlags = o.configureFlags ++[
+               "ac_cv_has_stdatomic=no"
+             ];
+           });
+         in e.override {
+           enableDebuginfod = false;
+         };
+
   hostapd =
     let
       config =  [
@@ -141,6 +156,10 @@ extraPkgs // {
       });
     in h.override { openssl = null; sqlite = null; };
 
+  # berlekey db needs libatomic which we haven't figured out yet.
+  # disabling it means we don't have arpd
+  iproute2 = prev.iproute2.override { db = null; };
+
   kexec-tools-static = prev.kexec-tools.overrideAttrs(o: {
     # For kexecboot we copy kexec into a ramdisk on the system being
     # upgraded from. This is more likely to work if kexec is
@@ -177,21 +196,33 @@ extraPkgs // {
     ];
   });
 
-  openssl = prev.openssl.overrideAttrs (o: {
+  openssl = prev.openssl.overrideAttrs (o:
-    # we want to apply
+    with final;
-    # https://patch-diff.githubusercontent.com/raw/openssl/openssl/pull/20273.patch";
+    let cross = stdenv.buildPlatform != stdenv.hostPlatform;
-    # which disables overriding the -march cflags to the wrong values,
+    in
-    # but openssl is used for bootstrapping so that's easier said than
+      {
-    # done. Do it the ugly way..
+        # we want to apply
-    postPatch =
+        # https://patch-diff.githubusercontent.com/raw/openssl/openssl/pull/20273.patch";
-      o.postPatch
+        # which disables overriding the -march cflags to the wrong values,
-      + (
+        # but openssl is used for bootstrapping so that's easier said than
-        with final;
+        # done. Do it the ugly way..
-        lib.optionalString (
+        postPatch =
-          stdenv.buildPlatform != stdenv.hostPlatform
+          o.postPatch
-        ) "\nsed -i.bak 's/linux.*-mips/linux-mops/' Configure\n"
+          + (
-      );
+            lib.optionalString cross ''
-  });
+              sed -i.bak 's/linux.*-mips/linux-mops/' Configure
+            ''
+          );
+        # openssl with threads requires stdatomic which drags in libgcc
+        # as a dependency
+        configureFlags = []
+                         ++ (lib.optional cross "no-threads")
+                         ++ o.configureFlags;
+
+        # don't need or want this bash script
+        postInstall = o.postInstall +
+                      (lib.optionalString cross "rm $bin/bin/c_rehash\n");
+      });
 
   pppBuild = prev.ppp;
 

pkgs/anoia/fs.fnl

@@ -38,9 +38,10 @@
 (fn dir [name]
   (let [dp (assert (ll.opendir name) name)]
     (fn []
-      (match (ll.readdir dp)
+      (case (ll.readdir dp)
-        (name type) (values name type)
+        (name filetype) (values name filetype)
-        (nil err) (do (if err (print err)) (ll.closedir dp) nil)))))
+        (nil err) (do (if (> err 0) (print "ERR" err)) (ll.closedir dp) nil)
+        ))))
 
 (fn rmtree [pathname]
   (case (file-type pathname)

pkgs/anoia/svc.fnl

@@ -1,13 +1,14 @@
 (local inotify (require :inotify))
 (local { : file-exists? } (require :anoia))
 (local { : file-type : dir &as fs } (require :anoia.fs))
+(local ll (require :lualinux))
 
 (fn read-line [name]
   (with-open [f (assert (io.open name :r) (.. "can't open file " name))]
     (f:read "*l")))
 
 (fn watch-fsevents [directory-name]
-  (let [handle (inotify.init)]
+  (let [handle (inotify.init { :blocking false})]
     (handle:addwatch directory-name
                      inotify.IN_CREATE
                      inotify.IN_MOVE
@@ -39,11 +40,16 @@
       (coroutine.yield self)
       (self:wait))))
 
+(fn read-with-timeout [watcher]
+  (let [fd (watcher:fileno)]
+    (ll.pollin fd 5000)
+    (watcher:read)))
+
 (fn open [directory]
   (let [watcher (watch-fsevents directory)
         has-file? (fn [filename] (file-exists? (.. directory "/" filename)))]
     {
-     :wait #(watcher:read)
+     :wait #(read-with-timeout watcher)
      :ready? (fn [self]
                (and (has-file? "state") (not (has-file? ".lock"))))
      :output (fn [_ filename]