dan/liminix
1
0
Fork 5
Code

refactor all writeFennelScript calls to use writeFennel directly

Browse Source
This commit is contained in:
Daniel Barlow 2024-08-30 20:57:42 +01:00
parent e745991b9d
commit 7d6c80570c
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/default.nix
View File

@ -127,5 +127,4 @@ in {
writeAshScript = callPackage ./write-ash-script { }; writeAshScript = callPackage ./write-ash-script { };
writeAshScriptBin = callPackage ./write-ash-script/bin.nix { }; writeAshScriptBin = callPackage ./write-ash-script/bin.nix { };
writeFennel = callPackage ./write-fennel { }; writeFennel = callPackage ./write-fennel { };
writeFennelScript = callPackage ./write-fennel-script { };
} }

9
pkgs/ifwait/default.nix
View File

@ -1,15 +1,14 @@
{ {
netlink-lua, netlink-lua,
writeFennelScript, writeFennel,
runCommand, runCommand,
anoia, anoia,
}: }:
runCommand "ifwait" { } '' runCommand "ifwait" { } ''
mkdir -p $out/bin mkdir -p $out/bin
cp -p ${ cp -p ${
writeFennelScript "ifwait" [ writeFennel "ifwait" {
anoia packages = [ anoia netlink-lua ];
netlink-lua } ./ifwait.fnl
] ./ifwait.fnl
} $out/bin/ifwait } $out/bin/ifwait
'' ''

6
pkgs/odhcp-script/default.nix
View File

@ -1,6 +1,8 @@
{ {
writeFennelScript, writeFennel,
anoia, anoia,
lualinux, lualinux,
}: }:
writeFennelScript "odhcpc-script" [anoia lualinux] ./odhcp6-script.fnl writeFennel "odhcpc-script" {
packages = [anoia lualinux];
} ./odhcp6-script.fnl

4
pkgs/systemconfig/default.nix
View File

@ -6,7 +6,7 @@
{ {
writeText, writeText,
writeFennelScript, writeFennel,
lib, lib,
s6-init-bin, s6-init-bin,
closureInfo, closureInfo,
@ -81,7 +81,7 @@ in attrset:
cp $closure/store-paths $out/etc/nix-store-paths cp $closure/store-paths $out/etc/nix-store-paths
$STRIP --remove-section=.note --remove-section=.comment --strip-all makedevs -o $out/bin/activate $STRIP --remove-section=.note --remove-section=.comment --strip-all makedevs -o $out/bin/activate
ln -s ${s6-init-bin}/bin/init $out/bin/init 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 cat > $out/bin/install <<EOF
#!/bin/sh -e #!/bin/sh -e
prefix=\''${1-/} prefix=\''${1-/}

4
tests/fennel/test.nix
View File

@ -5,10 +5,10 @@
let let
overlay = import "${liminix}/overlay.nix"; overlay = import "${liminix}/overlay.nix";
pkgs = import <nixpkgs> { overlays = [overlay]; }; pkgs = import <nixpkgs> { overlays = [overlay]; };
script = pkgs.writeFennelScript "foo" [] ./hello.fnl; script = pkgs.writeFennel "foo" {} ./hello.fnl;
inherit (pkgs.lua.pkgs) fifo; inherit (pkgs.lua.pkgs) fifo;
netlink = pkgs.netlink-lua; 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" { in pkgs.runCommand "check" {
} '' } ''
set -e set -e