liminix

commit d5d621f3109ec4dbaacda1bc83258481ece4583a
parent da95a9fa621c930dc87cd1506b6de0a847db712a
Author: Daniel Barlow <dan@telent.net>
Date:   Wed, 28 Aug 2024 19:12:00 +0100

rename http-fstree => json-to-fstree

it works for file urls as well, not just http

Diffstat:
M
modules/secrets/outboard.nix
 | 
6
+++---
M
pkgs/default.nix
 | 
2
+-
D
pkgs/http-fstree/default.nix
 | 
37
-------------------------------------
A
pkgs/json-to-fstree/default.nix
 | 
37
+++++++++++++++++++++++++++++++++++++
R
pkgs/http-fstree/http-fstree.fnl -> pkgs/json-to-fstree/json-to-fstree.fnl
 | 
0

5 files changed, 41 insertions(+), 41 deletions(-)
diff --git 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
@@ -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/http-fstree/default.nix
@@ -1,37 +0,0 @@
-{
-  fetchurl,
-  writeFennel,
-  fennel,
-  fennelrepl,
-  runCommand,
-  lua,
-  anoia,
-  linotify,
-  lualinux,
-  fetch-freebsd,
-  openssl,
-  rxi-json,
-  stdenv
-}:
-let name = "http-fstree";
-in stdenv.mkDerivation {
-  inherit name;
-  src = ./.;
-
-  buildInputs = [fetch-freebsd rxi-json openssl lua];
-
-  buildPhase = "";
-  installPhase = ''
-    mkdir -p $out/bin
-    cp -p ${writeFennel name {
-      packages = [
-        fetch-freebsd
-        rxi-json
-        anoia
-        lualinux
-        linotify
-      ] ;
-      mainFunction = "run";
-    } ./http-fstree.fnl } $out/bin/${name}
-  '';
-}
diff --git a/pkgs/json-to-fstree/default.nix b/pkgs/json-to-fstree/default.nix
@@ -0,0 +1,37 @@
+{
+  fetchurl,
+  writeFennel,
+  fennel,
+  fennelrepl,
+  runCommand,
+  lua,
+  anoia,
+  linotify,
+  lualinux,
+  fetch-freebsd,
+  openssl,
+  rxi-json,
+  stdenv
+}:
+let name = "json-to-fstree";
+in stdenv.mkDerivation {
+  inherit name;
+  src = ./.;
+
+  buildInputs = [fetch-freebsd rxi-json openssl lua];
+
+  buildPhase = "";
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -p ${writeFennel name {
+      packages = [
+        fetch-freebsd
+        rxi-json
+        anoia
+        lualinux
+        linotify
+      ] ;
+      mainFunction = "run";
+    } ./${name}.fnl } $out/bin/${name}
+  '';
+}
diff --git a/pkgs/http-fstree/http-fstree.fnl b/pkgs/json-to-fstree/json-to-fstree.fnl