about summary refs log tree commit diff
path: root/pkgs/profpatsch/execline
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/profpatsch/execline')
-rw-r--r--pkgs/profpatsch/execline/e.nix2
-rw-r--r--pkgs/profpatsch/execline/run-execline-tests.nix2
-rw-r--r--pkgs/profpatsch/execline/symlink.nix3
3 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/profpatsch/execline/e.nix b/pkgs/profpatsch/execline/e.nix
index 4c569bcd..5f8ac16a 100644
--- a/pkgs/profpatsch/execline/e.nix
+++ b/pkgs/profpatsch/execline/e.nix
@@ -2,7 +2,7 @@
 let
 
   bins = getBins pkgs.rlwrap [ "rlwrap" ]
-    // getBins pkgs.s6-portable-utils [ { use = "s6-cat"; as = "cat"; } "s6-test" ]
+    // getBins pkgs.s6-portable-utils [ { use = "s6-cat"; as = "cat"; } ]
     // getBins pkgs.execline [ "execlineb" ];
 
   # minimal execline shell
diff --git a/pkgs/profpatsch/execline/run-execline-tests.nix b/pkgs/profpatsch/execline/run-execline-tests.nix
index c3f534cc..5482a643 100644
--- a/pkgs/profpatsch/execline/run-execline-tests.nix
+++ b/pkgs/profpatsch/execline/run-execline-tests.nix
@@ -81,7 +81,7 @@ let
     };
   } [
     "importas" "-ui" "v" "myvar"
-    "if" [ bin.s6-test "myvalue" "=" "$v" ]
+    "if" [ bin.eltest "myvalue" "=" "$v" ]
       "importas" "out" "out"
       bin.s6-touch "$out"
   ];
diff --git a/pkgs/profpatsch/execline/symlink.nix b/pkgs/profpatsch/execline/symlink.nix
index 30c21ea4..8791c312 100644
--- a/pkgs/profpatsch/execline/symlink.nix
+++ b/pkgs/profpatsch/execline/symlink.nix
@@ -13,7 +13,6 @@ runExecline name {
         (toNetstring dest + (toNetstring orig)))
       links;
     passAsFile = [ "pathTuples" ];
-    # bah! coreutils just for cat :(
     PATH = lib.makeBinPath [ s6-portable-utils ];
   };
 } [
@@ -31,7 +30,7 @@ runExecline name {
       "s6-mkdir" "-p" "$d"
     ]
 
-    "ifthenelse" [ "s6-test" "-L" "$orig" ] [
+    "ifthenelse" [ "eltest" "-L" "$orig" ] [
       "backtick" "-n" "res" [ "s6-linkname" "-f" "$orig" ]
       "importas" "-ui" "res" "res"
       "s6-ln" "-fs" "$res" "$dest"