diff options
| author | Profpatsch <mail@profpatsch.de> | 2020-06-28T02·52+0200 |
|---|---|---|
| committer | Profpatsch <mail@profpatsch.de> | 2020-06-30T00·19+0000 |
| commit | 2f21e0c8c0b47dcf1b29c38a32838f48bd873c0b (patch) | |
| tree | 885b671e4c9f5ee887700130dc4bfba9926dab49 /nix/runExecline | |
| parent | 4402c363b6137112716e82b93e946634aefbb600 (diff) | |
refactor(nix): use our own writeScript(Bin) r/1133
We have this nice `runExecline` now, so we don’t need to use `runCommand` (which spawns bash) just to write a simple script. Change-Id: I2941ed8c1448fa1d7cc02dc18b24a8a945b2c38b Reviewed-on: https://cl.tvl.fyi/c/depot/+/704 Tested-by: BuildkiteCI Reviewed-by: tazjin <mail@tazj.in> Reviewed-by: BuildkiteCI
Diffstat (limited to 'nix/runExecline')
| -rw-r--r-- | nix/runExecline/default.nix | 2 | ||||
| -rw-r--r-- | nix/runExecline/tests.nix | 19 |
2 files changed, 2 insertions, 19 deletions
diff --git a/nix/runExecline/default.nix b/nix/runExecline/default.nix index 0b87b1366d..22d968a1c6 100644 --- a/nix/runExecline/default.nix +++ b/nix/runExecline/default.nix @@ -8,7 +8,7 @@ let tests = import ./tests.nix { inherit runExecline; - inherit (depot.nix) getBins; + inherit (depot.nix) getBins writeScript; inherit (pkgs) stdenv coreutils; inherit pkgs; }; diff --git a/nix/runExecline/tests.nix b/nix/runExecline/tests.nix index cd7f4220b0..a8f91f3cf3 100644 --- a/nix/runExecline/tests.nix +++ b/nix/runExecline/tests.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, runExecline, getBins +{ stdenv, pkgs, runExecline, getBins, writeScript # https://www.mail-archive.com/skaware@list.skarnet.org/msg01256.html , coreutils }: @@ -19,23 +19,6 @@ let "s6-test" ]; - # lol - writeScript = name: script: runExecline name { - derivationArgs = { - inherit script; - passAsFile = [ "script" ]; - preferLocalBuild = true; - allowSubstitutes = false; - }; - } [ - "importas" "-ui" "s" "scriptPath" - "importas" "-ui" "out" "out" - "foreground" [ - bins.mv "$s" "$out" - ] - bins.s6-chmod "0755" "$out" - ]; - # execline block of depth 1 block = args: builtins.map (arg: " ${arg}") args ++ [ "" ]; |