diff --git a/modules/s6/default.nix b/modules/s6/default.nix index 302224f..b31e606 100644 --- 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 index ad03692..75237c6 100644 --- 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/Makefile b/pkgs/logtap/Makefile similarity index 100% rename from pkgs/logshipper/Makefile rename to pkgs/logtap/Makefile diff --git a/pkgs/logshipper/default.nix b/pkgs/logtap/default.nix similarity index 81% rename from pkgs/logshipper/default.nix rename to pkgs/logtap/default.nix index a367458..754eb34 100644 --- a/pkgs/logshipper/default.nix +++ b/pkgs/logtap/default.nix @@ -2,7 +2,7 @@ stdenv, }: stdenv.mkDerivation { - name = "logshipper"; + name = "logtap"; makeFlags = [ "PREFIX=${placeholder "out"}" ]; src = ./.; } diff --git a/pkgs/logshipper/logtap.c b/pkgs/logtap/logtap.c similarity index 100% rename from pkgs/logshipper/logtap.c rename to pkgs/logtap/logtap.c