From 93f5d251eaf7d2944d542281ae6e54ccfa306fd0 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Thu, 26 Sep 2019 03:49:38 +0200
Subject: pkgs/profpatsch/runExecline: move to writeCommand form
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It’s conventional that these tools have the form

  tool name options data

so we should adhere to that.
---
 pkgs/profpatsch/execline/run-execline-tests.nix | 52 +++++++++++--------------
 1 file changed, 22 insertions(+), 30 deletions(-)

(limited to 'pkgs/profpatsch/execline/run-execline-tests.nix')

diff --git a/pkgs/profpatsch/execline/run-execline-tests.nix b/pkgs/profpatsch/execline/run-execline-tests.nix
index 02894956..c3f534cc 100644
--- a/pkgs/profpatsch/execline/run-execline-tests.nix
+++ b/pkgs/profpatsch/execline/run-execline-tests.nix
@@ -5,23 +5,21 @@
 let
 
   # lol
-  writeScript = name: script: runExecline {
-    inherit name;
+  writeScript = name: script: runExecline name {
     derivationArgs = {
       inherit script;
       passAsFile = [ "script" ];
       preferLocalBuild = true;
       allowSubstitutes = false;
     };
-    execline = [
+  } [
       "importas" "-ui" "s" "scriptPath"
       "importas" "-ui" "out" "out"
       "foreground" [
         "${coreutils}/bin/mv" "$s" "$out"
       ]
       "${bin.s6-chmod}" "0755" "$out"
-    ];
-   };
+  ];
 
   # execline block of depth 1
   block = args: builtins.map (arg: " ${arg}") args ++ [ "" ];
@@ -48,50 +46,44 @@ let
   };
 
   # basic test that touches out
-  basic = runExecline {
-    name = "run-execline-test-basic";
-    execline = [
-      "importas" "-ui" "out" "out"
-      "${bin.s6-touch}" "$out"
-    ];
+  basic = runExecline "run-execline-test-basic" {
     derivationArgs = {
       preferLocalBuild = true;
       allowSubstitutes = false;
     };
-  };
+  } [
+      "importas" "-ui" "out" "out"
+      "${bin.s6-touch}" "$out"
+  ];
 
   # whether the stdin argument works as intended
-  stdin = fileHasLine "foo" (runExecline {
-    name = "run-execline-test-stdin";
+  stdin = fileHasLine "foo" (runExecline "run-execline-test-stdin" {
     stdin = "foo\nbar\nfoo";
-    execline = [
-      "importas" "-ui" "out" "out"
-      # this pipes stdout of s6-cat to $out
-      # and s6-cat redirects from stdin to stdout
-      "redirfd" "-w" "1" "$out" bin.s6-cat
-    ];
     derivationArgs = {
       preferLocalBuild = true;
       allowSubstitutes = false;
     };
-  });
+  } [
+      "importas" "-ui" "out" "out"
+      # this pipes stdout of s6-cat to $out
+      # and s6-cat redirects from stdin to stdout
+      "redirfd" "-w" "1" "$out" bin.s6-cat
+  ]);
 
-  wrapWithVar = runExecline {
-    name = "run-execline-test-wrap-with-var";
+  wrapWithVar = runExecline "run-execline-test-wrap-with-var" {
     builderWrapper = writeScript "var-wrapper" ''
       #!${bin.execlineb} -S0
       export myvar myvalue $@
     '';
-    execline = [
-      "importas" "-ui" "v" "myvar"
-      "if" [ bin.s6-test "myvalue" "=" "$v" ]
-        "importas" "out" "out"
-        bin.s6-touch "$out"
-    ];
     derivationArgs = {
       preferLocalBuild = true;
       allowSubstitutes = false;
     };
-  };
+  } [
+    "importas" "-ui" "v" "myvar"
+    "if" [ bin.s6-test "myvalue" "=" "$v" ]
+      "importas" "out" "out"
+      bin.s6-touch "$out"
+  ];
 
 in [ basic stdin wrapWithVar ]
-- 
cgit 1.4.1