From 93f5d251eaf7d2944d542281ae6e54ccfa306fd0 Mon Sep 17 00:00:00 2001 From: Profpatsch 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/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'pkgs/profpatsch/default.nix') diff --git a/pkgs/profpatsch/default.nix b/pkgs/profpatsch/default.nix index bb10198e..69977fff 100644 --- a/pkgs/profpatsch/default.nix +++ b/pkgs/profpatsch/default.nix @@ -61,12 +61,14 @@ let // (bins pkgs.execline [ "redirfd" "importas" "exec" ]); inherit stdenv lib; }; - itLocal = args: it (args // { - derivationArgs = args.derivationArgs or {} // { - preferLocalBuild = true; - allowSubstitutes = false; - }; - }); + itLocal = name: args: execline: + it name (args // { + derivationArgs = args.derivationArgs or {} // { + preferLocalBuild = true; + allowSubstitutes = false; + }; + }) execline; + tests = import ./execline/run-execline-tests.nix { # can’t use runExeclineLocal in the tests, # because it is tested by the tests (well, it does @@ -85,7 +87,8 @@ let }; in { runExecline = it; - runExeclineLocal = args: testing.drvSeqL tests (itLocal args); + runExeclineLocal = name: args: execline: + testing.drvSeqL tests (itLocal name args execline); }; -- cgit 1.4.1