diff --git a/modules/secrets/outboard.nix b/modules/secrets/outboard.nix index d32389f..7e61e39 100644 --- a/modules/secrets/outboard.nix +++ b/modules/secrets/outboard.nix @@ -1,17 +1,17 @@ { - liminix, lib, http-fstree, serviceFns + liminix, lib, json-to-fstree, serviceFns }: { name, url, interval } : let inherit (liminix.services) oneshot longrun; in longrun { inherit name; - buildInputs = [ http-fstree ]; + buildInputs = [ json-to-fstree ]; run = '' . ${serviceFns} ( in_outputs ${name} while : ; do - ${http-fstree}/bin/http-fstree ${url} . + ${json-to-fstree}/bin/json-to-fstree ${url} . sleep ${builtins.toString (interval * 60)} done ) diff --git a/pkgs/default.nix b/pkgs/default.nix index ce0de84..45dc579 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -69,9 +69,9 @@ in { gen_init_cpio = callPackage ./gen_init_cpio { }; go-l2tp = callPackage ./go-l2tp { }; hi = callPackage ./hi { }; - http-fstree = callPackage ./http-fstree { }; ifwait = callPackage ./ifwait { }; initramfs-peek = callPackage ./initramfs-peek { }; + json-to-fstree = callPackage ./json-to-fstree { }; kernel-backport = callPackage ./kernel-backport { }; kmodloader = callPackage ./kmodloader { }; levitate = callPackage ./levitate { }; diff --git a/pkgs/http-fstree/default.nix b/pkgs/json-to-fstree/default.nix similarity index 88% rename from pkgs/http-fstree/default.nix rename to pkgs/json-to-fstree/default.nix index ba31cc4..45c60a2 100644 --- a/pkgs/http-fstree/default.nix +++ b/pkgs/json-to-fstree/default.nix @@ -13,7 +13,7 @@ rxi-json, stdenv }: -let name = "http-fstree"; +let name = "json-to-fstree"; in stdenv.mkDerivation { inherit name; src = ./.; @@ -32,6 +32,6 @@ in stdenv.mkDerivation { linotify ] ; mainFunction = "run"; - } ./http-fstree.fnl } $out/bin/${name} + } ./${name}.fnl } $out/bin/${name} ''; } diff --git a/pkgs/http-fstree/http-fstree.fnl b/pkgs/json-to-fstree/json-to-fstree.fnl similarity index 100% rename from pkgs/http-fstree/http-fstree.fnl rename to pkgs/json-to-fstree/json-to-fstree.fnl