liminix

commit 7904c6bfe92420fe2776dc709a45c26762c96357
parent 74b8c98aafd0342b14e719f4fe64f8b15364d32f
Author: Daniel Barlow <dan@telent.net>
Date:   Tue, 12 Sep 2023 18:46:04 +0100

anoia users now need lfs

... and we need to figure out how to do transitive
dependencies, because this is not a great experience

Diffstat:
M
examples/acquire-delegated-prefix.nix
 | 
3
++-
M
examples/acquire-wan-address.nix
 | 
3
++-
M
pkgs/anoia/default.nix
 | 
1
+
M
pkgs/odhcp-script/default.nix
 | 
4
+++-

4 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/examples/acquire-delegated-prefix.nix b/examples/acquire-delegated-prefix.nix
@@ -2,7 +2,8 @@
   writeFennelScript
 , linotify
 , anoia
+, lua
 }:
 writeFennelScript "acquire-delegated-prefix"
-  [ linotify anoia ]
+  [ linotify anoia lua.pkgs.luafilesystem ]
   ./acquire-delegated-prefix.fnl
diff --git a/examples/acquire-wan-address.nix b/examples/acquire-wan-address.nix
@@ -2,8 +2,9 @@
   writeFennel
 , linotify
 , anoia
+, lua
 }:
 writeFennel "acquire-wan-address" {
-  packages = [ linotify anoia ];
+  packages = [ linotify anoia lua.pkgs.luafilesystem ];
   mainFunction = "run";
 } ./acquire-wan-address.fnl
diff --git a/pkgs/anoia/default.nix b/pkgs/anoia/default.nix
@@ -9,6 +9,7 @@ in stdenv.mkDerivation {
   version = "0.1";
   src = ./.;
   nativeBuildInputs = [ fennel ];
+  buildInputs = with lua.pkgs; [ luafilesystem ];
   buildPhase = ''
     for f in *.fnl ; do
       fennel --compile $f > `basename $f .fnl`.lua
diff --git a/pkgs/odhcp-script/default.nix b/pkgs/odhcp-script/default.nix
@@ -1,4 +1,6 @@
 {
   writeFennelScript
+, anoia
+, lua
 }:
-writeFennelScript  "odhcpc-script" [] ./odhcp6-script.fnl
+writeFennelScript  "odhcpc-script" [anoia lua.pkgs.luafilesystem] ./odhcp6-script.fnl