diff options
| author | sternenseemann <sternenseemann@systemli.org> | 2023-04-10 14:42:16 +0200 |
|---|---|---|
| committer | Profpatsch <mail@profpatsch.de> | 2023-04-10 15:26:26 +0200 |
| commit | 75efbe3f8cf3495e62ff7cc6e0bcfaed75cc9cbf (patch) | |
| tree | 661d2f8e7c021cb4904fc270c38dad7c3d02785a /modules | |
| parent | e0cb068a4bbad0beda3b5c8c8a25aa37df631d40 (diff) | |
treewide: s6-test is dead, long live eltest!
Recent versions of s6-portable-utils no longer include s6-test which was deprecated in favor of eltest which supposedly has the same interface. I've not tested this commit very thoroughly, but my system now builds again with recent nixpkgs commits (I think I dependended on s6-test via the rust writer via nman). cc @Profpatsch
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/user/profpatsch/programs/weechat.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/modules/user/profpatsch/programs/weechat.nix b/modules/user/profpatsch/programs/weechat.nix index 2373598f..5870d078 100644 --- a/modules/user/profpatsch/programs/weechat.nix +++ b/modules/user/profpatsch/programs/weechat.nix @@ -27,8 +27,9 @@ let bins = getBins pkgs.tmux [ "tmux" ] // getBins weechat-with-scripts [ "weechat" ] // getBins pkgs.dash [ "dash" ] - // getBins pkgs.s6-portable-utils [ "s6-sleep" "s6-test" ] + // getBins pkgs.s6-portable-utils [ "s6-sleep" ] // getBins pkgs.mosh [ "mosh-server" ] + // getBins pkgs.execline [ "eltest" ] ; @@ -60,7 +61,7 @@ let attachWeechatTmuxSession = writeExecline "attach-weechat-tmux-session" {} [ "importas" "-u" "-D" "" "what" "SSH_ORIGINAL_COMMAND" # if the user passes "ssh" as argv, it will call tmux directly - "ifelse" [ bins.s6-test "$what" "=" "ssh" ] + "ifelse" [ bins.eltest "$what" "=" "ssh" ] [ bins.tmux "attach-session" "-t" sessionName ] # if not, it uses the mosh-server (default) bins.mosh-server "--" |