liminix

commit a343e6323197c64c2760e787d1574ab675d18234
parent cacde953cb887eb833985c9bb06dc93bb4537a34
Author: Daniel Barlow <dan@telent.net>
Date:   Sun,  5 Oct 2025 15:13:07 +0100

rename logshipper -> logtap

- it matches the executable name
- it doesn't ship anything anyway, it's just plumbing

Diffstat:
M
modules/s6/default.nix
 | 
2
+-
M
pkgs/default.nix
 | 
2
+-
D
pkgs/logshipper/default.nix
 | 
8
--------
R
pkgs/logshipper/Makefile -> pkgs/logtap/Makefile
 | 
0

A
pkgs/logtap/default.nix
 | 
8
++++++++
R
pkgs/logshipper/logtap.c -> pkgs/logtap/logtap.c
 | 
0

6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/modules/s6/default.nix b/modules/s6/default.nix
@@ -31,7 +31,7 @@ let
       pipecmds =
         [ "${s6}/bin/s6-log -bpd3 -- ${cfg.script} 1" ]
         ++ (lib.optional (cfg ? persistent && cfg.persistent.enable) "/bin/tee /dev/pmsg0")
-        ++ (lib.optional cfg.shipping.enable "${pkgs.logshipper}/bin/logtap ${cfg.shipping.socket} logshipper-socket-event");
+        ++ (lib.optional cfg.shipping.enable "${pkgs.logtap}/bin/logtap ${cfg.shipping.socket} logshipper-socket-event");
     in
     ''
       #!${execline}/bin/execlineb -P
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -100,7 +100,7 @@ in
   levitate = callPackage ./levitate { };
   libubootenv = callPackage ./libubootenv { };
   linotify = callPackage ./linotify { };
-  logshipper = callPackage ./logshipper { };
+  logtap = callPackage ./logtap { };
   lualinux = callPackage ./lualinux { };
 
   # we need to build real lzma instead of using xz, because the lzma
diff --git a/pkgs/logshipper/default.nix b/pkgs/logshipper/default.nix
@@ -1,8 +0,0 @@
-{
-  stdenv,
-}:
-stdenv.mkDerivation {
-  name = "logshipper";
-  makeFlags = [ "PREFIX=${placeholder "out"}" ];
-  src = ./.;
-}
diff --git a/pkgs/logshipper/Makefile b/pkgs/logtap/Makefile
diff --git a/pkgs/logtap/default.nix b/pkgs/logtap/default.nix
@@ -0,0 +1,8 @@
+{
+  stdenv,
+}:
+stdenv.mkDerivation {
+  name = "logtap";
+  makeFlags = [ "PREFIX=${placeholder "out"}" ];
+  src = ./.;
+}
diff --git a/pkgs/logshipper/logtap.c b/pkgs/logtap/logtap.c