liminix

commit 7d6c80570c6d0ed3ace2b6cd94a05b23d8faee7a
parent e745991b9d20fe11bf17873de7087f015c4bea1b
Author: Daniel Barlow <dan@telent.net>
Date:   Fri, 30 Aug 2024 20:57:42 +0100

refactor all writeFennelScript calls to use writeFennel directly

Diffstat:
M
pkgs/default.nix
 | 
1
-
M
pkgs/ifwait/default.nix
 | 
9
++++-----
M
pkgs/odhcp-script/default.nix
 | 
6
++++--
M
pkgs/systemconfig/default.nix
 | 
4
++--
M
tests/fennel/test.nix
 | 
4
++--

5 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -127,5 +127,4 @@ in {
   writeAshScript = callPackage ./write-ash-script { };
   writeAshScriptBin = callPackage ./write-ash-script/bin.nix { };
   writeFennel = callPackage ./write-fennel { };
-  writeFennelScript = callPackage ./write-fennel-script { };
 }
diff --git a/pkgs/ifwait/default.nix b/pkgs/ifwait/default.nix
@@ -1,15 +1,14 @@
 {
   netlink-lua,
-  writeFennelScript,
+  writeFennel,
   runCommand,
   anoia,
 }:
 runCommand "ifwait" { } ''
   mkdir -p $out/bin
   cp -p ${
-    writeFennelScript "ifwait" [
-      anoia
-      netlink-lua
-    ] ./ifwait.fnl
+    writeFennel "ifwait" {
+      packages = [ anoia netlink-lua ];
+    } ./ifwait.fnl
   } $out/bin/ifwait
 ''
diff --git a/pkgs/odhcp-script/default.nix b/pkgs/odhcp-script/default.nix
@@ -1,6 +1,8 @@
 {
-  writeFennelScript,
+  writeFennel,
   anoia,
   lualinux,
 }:
-writeFennelScript  "odhcpc-script" [anoia lualinux] ./odhcp6-script.fnl
+writeFennel  "odhcpc-script" {
+  packages = [anoia lualinux];
+} ./odhcp6-script.fnl
diff --git a/pkgs/systemconfig/default.nix b/pkgs/systemconfig/default.nix
@@ -6,7 +6,7 @@
 
 {
   writeText,
-  writeFennelScript,
+  writeFennel,
   lib,
   s6-init-bin,
   closureInfo,
@@ -81,7 +81,7 @@ in attrset:
       cp $closure/store-paths $out/etc/nix-store-paths
       $STRIP --remove-section=.note  --remove-section=.comment --strip-all makedevs -o $out/bin/activate
       ln -s ${s6-init-bin}/bin/init $out/bin/init
-      cp -p ${writeFennelScript "restart-services" [] ./restart-services.fnl} $out/bin/restart-services
+      cp -p ${writeFennel "restart-services" {} ./restart-services.fnl} $out/bin/restart-services
       cat > $out/bin/install <<EOF
       #!/bin/sh -e
       prefix=\''${1-/}
diff --git a/tests/fennel/test.nix b/tests/fennel/test.nix
@@ -5,10 +5,10 @@
 let
   overlay = import "${liminix}/overlay.nix";
   pkgs = import <nixpkgs> { overlays = [overlay]; };
-  script = pkgs.writeFennelScript "foo" [] ./hello.fnl;
+  script = pkgs.writeFennel "foo" {} ./hello.fnl;
   inherit (pkgs.lua.pkgs) fifo;
   netlink = pkgs.netlink-lua;
-  script2 = pkgs.writeFennelScript "foo2" [fifo netlink] ./hello.fnl;
+  script2 = pkgs.writeFennel "foo2" { packages = [fifo netlink];} ./hello.fnl;
 in pkgs.runCommand "check" {
   } ''
 set -e