liminix

commit 482b60eb9136c144fa372e21147f8fc44c5c580a
parent 875a4ae512232e165fdc784fb8c0ee79a0281c57
Author: Daniel Barlow <dan@telent.net>
Date:   Tue,  5 May 2026 14:18:20 +0100

Merge remote-tracking branch 'pcc/fix5'

Diffstat:
M
pkgs/ifwait/ifwait.fnl
 | 
4
+++-
M
pkgs/netlink-lua/default.nix
 | 
6
+++---

2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/pkgs/ifwait/ifwait.fnl b/pkgs/ifwait/ifwait.fnl
@@ -52,7 +52,9 @@
 
     (if parameters.service
         (each [e (event-fn)]
-          (if (= e.name parameters.link)
+          (if (and (= e.name parameters.link)
+                   (or (= e.event "newlink") (= e.event "dellink"))
+                   (= e.family "AF_UNSPEC"))
               (toggle-service parameters.service (event-matches? parameters e))))
         (each [e (event-fn)
                &until (event-matches? parameters e)]
diff --git a/pkgs/netlink-lua/default.nix b/pkgs/netlink-lua/default.nix
@@ -15,11 +15,11 @@ lua.pkgs.buildLuaPackage {
   src = fetchFromGitHub {
     repo = "lua-netlink";
     owner = "chris2511";
-    rev = "ff8d2012ea42291c87150ba47d4cd89860f7872e";
-    hash = "sha256-tnvFKXxLX+/Q4nJcRDrUfK7bAHBWEANFTBR1PjbQsmQ=";
+    rev = "41e5ced77a5d68239988ac71ca9476ad496dc047";
+    hash = "sha256-z4EK2sKxTdDShhD8e5Z6IeZyQduwOqbXeXmkMhsOTIU=";
   };
 
-  buildPhase = "$CC -shared -l mnl -l lua -o netlink.so src/*.c";
+  buildPhase = "$CC -shared -l mnl -l lua -DVERSION=\\\"1.1.0\\\" -o netlink.so src/*.c";
 
   installPhase = ''
     mkdir -p "$out/lib/lua/${lua.luaversion}"