From e9975c9a39cb4e654d9132de4b952f51174a0926 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Wed, 2 Oct 2019 00:22:14 +0200 Subject: pkgs/profpatsch: writeExecline, writeExeclineLocal similar to writeScript, but writes an execline instead. Should be upstreams to `lib.writers` sometimes. --- pkgs/profpatsch/default.nix | 6 ++++++ pkgs/profpatsch/execline/write-execline.nix | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/profpatsch/execline/write-execline.nix (limited to 'pkgs') diff --git a/pkgs/profpatsch/default.nix b/pkgs/profpatsch/default.nix index b697bd75..eb1bf8fa 100644 --- a/pkgs/profpatsch/default.nix +++ b/pkgs/profpatsch/default.nix @@ -105,6 +105,10 @@ let testing.drvSeqL tests (itLocal name args execline); }; + writeExeclineFns = import ./write-execline.nix { + inherit pkgs execlineb-with-builtins; + }; + in rec { inherit (nixperiments) @@ -153,6 +157,8 @@ in rec { inherit (runExeclineFns) runExecline runExeclineLocal; + inherit (writeExeclineFns) + writeExecline writeExeclineBin; inherit getBins; diff --git a/pkgs/profpatsch/execline/write-execline.nix b/pkgs/profpatsch/execline/write-execline.nix new file mode 100644 index 00000000..721261a2 --- /dev/null +++ b/pkgs/profpatsch/execline/write-execline.nix @@ -0,0 +1,18 @@ +{ pkgs, execlineb-with-builtins }: +let + escape = ./escape.nix { inherit (pkgs) lib; }; + + # Write a list of execline argv parameters to an execline script. + # Everything is escaped correctly. + # TODO upstream into nixpkgs + writeExeclineCommon = writer: name: { readNArgs ? 0 }: argList: writer name '' + #!${execlineb-with-builtins}/bin/execlineb -s${toString readNArgs} + export EXECLINE_STRICT 2 + ${escape.escapeExecline argList} + ''; + writeExecline = writeExeclineCommon pkgs.writeScript; + writeExeclineBin = writeExeclineCommon pkgs.writeScriptBin; + +in { + inherit writeExecline writeExeclineBin; +} -- cgit 1.4.1