From 5427456c214f08fbe42c42fbf9841681d3881cb6 Mon Sep 17 00:00:00 2001 From: Daniel Barlow Date: Sat, 4 Mar 2023 21:19:30 +0000 Subject: [PATCH] rename notificationFd to notification-fd it's perfectly valid syntax and consistent with the s6 spelling --- pkgs/liminix-tools/services/builder.sh | 3 +-- pkgs/liminix-tools/services/default.nix | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/liminix-tools/services/builder.sh b/pkgs/liminix-tools/services/builder.sh index 6c7eef19..f6b84bef 100644 --- a/pkgs/liminix-tools/services/builder.sh +++ b/pkgs/liminix-tools/services/builder.sh @@ -11,10 +11,9 @@ test -n "$contents" && for d in $contents; do touch $out/${name}/contents.d/$d done test -n "$run" && (echo -e "$run" > $out/${name}/run) -test -n "${notificationFd}" && (echo ${notificationFd} > $out/${name}/notification-fd) +test -n "${notification-fd}" && (echo ${notification-fd} > $out/${name}/notification-fd) test -n "$up" && (echo -e "$up" > $out/${name}/up) test -n "$down" && (echo -e "$down" > $out/${name}/down) ( cd $out && ln -s /run/service-state/${name} ./.outputs ) for i in $out/${name}/{down,up,run} ; do test -f $i && chmod +x $i; done true -# (echo $out/${name} && cd $out/${name} && find . -ls) diff --git a/pkgs/liminix-tools/services/default.nix b/pkgs/liminix-tools/services/default.nix index 89eb5af1..4e20a2f4 100644 --- a/pkgs/liminix-tools/services/default.nix +++ b/pkgs/liminix-tools/services/default.nix @@ -28,11 +28,10 @@ let } @ args: stdenvNoCC.mkDerivation { # we use stdenvNoCC to avoid generating derivations with names # like foo.service-mips-linux-musl - inherit name serviceType up down run; + inherit name serviceType up down run notification-fd; buildInputs = dependencies ++ contents; dependencies = builtins.map (d: d.name) dependencies; contents = builtins.map (d: d.name) contents; - notificationFd = notification-fd; builder = ./builder.sh; };