style: Switch to nixfmt from nixpkgs-fmt
Most of the ecosystem has moved to this formatter, and many people configured their editors to autoformat it with this formatter. Closes: https://git.snix.dev/snix/snix/issues/62 Change-Id: Icf39e7836c91fc2ae49fbe22a40a639105bfb0bd Reviewed-on: https://cl.snix.dev/c/snix/+/30671 Reviewed-by: Florian Klink <flokli@flokli.de> Tested-by: besadii Autosubmit: Ilan Joselevich <personal@ilanjoselevich.com>
This commit is contained in:
parent
3443e6bd08
commit
91d02d8c84
136 changed files with 39952 additions and 11007 deletions
|
|
@ -4,8 +4,8 @@ let
|
|||
# e.g.
|
||||
# a"b\c -> "a\"b\\c"
|
||||
# a\"bc -> "a\\\"bc"
|
||||
escapeExeclineArg = arg:
|
||||
''"${builtins.replaceStrings [ ''"'' ''\'' ] [ ''\"'' ''\\'' ] (toString arg)}"'';
|
||||
escapeExeclineArg =
|
||||
arg: ''"${builtins.replaceStrings [ ''"'' ''\'' ] [ ''\"'' ''\\'' ] (toString arg)}"'';
|
||||
|
||||
# Escapes an execline (list of execline strings) to be passed to execlineb
|
||||
# Give it a nested list of strings. Nested lists are interpolated as execline
|
||||
|
|
@ -15,15 +15,24 @@ let
|
|||
# Example:
|
||||
# escapeExecline [ "if" [ "somecommand" ] "true" ]
|
||||
# == ''"if" { "somecommand" } "true"''
|
||||
escapeExecline = execlineList: lib.concatStringsSep " "
|
||||
(
|
||||
escapeExecline =
|
||||
execlineList:
|
||||
lib.concatStringsSep " " (
|
||||
let
|
||||
go = arg:
|
||||
if builtins.isString arg then [ (escapeExeclineArg arg) ]
|
||||
else if builtins.isPath arg then [ (escapeExeclineArg "${arg}") ]
|
||||
else if lib.isDerivation arg then [ (escapeExeclineArg arg) ]
|
||||
else if builtins.isList arg then [ "{" ] ++ builtins.concatMap go arg ++ [ "}" ]
|
||||
else abort "escapeExecline can only hande nested lists of strings, was ${lib.generators.toPretty {} arg}";
|
||||
go =
|
||||
arg:
|
||||
if builtins.isString arg then
|
||||
[ (escapeExeclineArg arg) ]
|
||||
else if builtins.isPath arg then
|
||||
[ (escapeExeclineArg "${arg}") ]
|
||||
else if lib.isDerivation arg then
|
||||
[ (escapeExeclineArg arg) ]
|
||||
else if builtins.isList arg then
|
||||
[ "{" ] ++ builtins.concatMap go arg ++ [ "}" ]
|
||||
else
|
||||
abort "escapeExecline can only hande nested lists of strings, was ${
|
||||
lib.generators.toPretty { } arg
|
||||
}";
|
||||
in
|
||||
builtins.concatMap go execlineList
|
||||
);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue