diff options
author | sternenseemann <sternenseemann@systemli.org> | 2023-04-10 14:42:16 +0200 |
---|---|---|
committer | sternenseemann <sternenseemann@systemli.org> | 2023-04-10 14:42:16 +0200 |
commit | b1fcde65e2b1adaaa3e9069d7722ee2b70c5a38f (patch) | |
tree | 0c958e3093cff20da48ebdd71378deedd531cc18 /pkgs/profpatsch/xdg-open/default.nix | |
parent | 3b0a1c8f61b941df0abe9baf4e673d0846a6ce0f (diff) |
treewide: s6-test is dead, long live eltest! s6-test-removed
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 'pkgs/profpatsch/xdg-open/default.nix')
-rw-r--r-- | pkgs/profpatsch/xdg-open/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/profpatsch/xdg-open/default.nix b/pkgs/profpatsch/xdg-open/default.nix index c23adeb9..f10e13a6 100644 --- a/pkgs/profpatsch/xdg-open/default.nix +++ b/pkgs/profpatsch/xdg-open/default.nix @@ -17,7 +17,7 @@ let // getBins pkgs.coreutils [ "printf" "ln" "echo" ] // getBins pkgs.fdtools [ "multitee" ] // getBins pkgs.s6 [ "s6-ioconnect" ] - // getBins pkgs.s6-portable-utils [ "s6-test" ] + // getBins pkgs.execline [ "eltest" ] // getBins pkgs.s6-networking [ "s6-tcpclient" ] // getBins pkgs.libressl.nc [ "nc" ] // getBins pkgs.dmenu [ "dmenu" "dmenu_path" ] @@ -199,8 +199,8 @@ let http-request = writeExecline "http-request" { } [ "importas" "-i" "protocol" "protocol" - "ifelse" [ bins.s6-test "$protocol" "=" "http" ] [ (http-https-request false) ] - "ifelse" [ bins.s6-test "$protocol" "=" "https" ] [ (http-https-request true) ] + "ifelse" [ bins.eltest "$protocol" "=" "http" ] [ (http-https-request false) ] + "ifelse" [ bins.eltest "$protocol" "=" "https" ] [ (http-https-request true) ] eprintf "protocol \${protocol} not supported" ]; @@ -274,7 +274,7 @@ let record-get [ "status" "status-text" "headers" ] "importas" "-ui" "status" "status" # TODO: a test util for netencode values - "ifelse" [ bins.s6-test "$status" "=" "n6:301," ] + "ifelse" [ bins.eltest "$status" "=" "n6:301," ] # retry the redirection location [ as-stdin "headers" record-get [ "Location" ] |