diff options
| author | lassulus <lassulus@lassul.us> | 2017-10-17 21:35:17 +0200 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2017-10-17 21:35:17 +0200 |
| commit | 9af86e7134ae2f134bc93baf5d0332ad2a77f9f9 (patch) | |
| tree | bf04c0844e560c03a0a156be1013b3b1fd329184 /krebs/5pkgs | |
| parent | 4667bb8e4111abde822ae57993a29929c5cc9aad (diff) | |
| parent | 3c810fef8ac062689a76de26b782d57692ddac90 (diff) | |
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'krebs/5pkgs')
| -rw-r--r-- | krebs/5pkgs/simple/populate/default.nix | 4 | ||||
| -rw-r--r-- | krebs/5pkgs/simple/quote.nix | 13 | ||||
| -rw-r--r-- | krebs/5pkgs/simple/withGetopt.nix | 5 |
3 files changed, 19 insertions, 3 deletions
diff --git a/krebs/5pkgs/simple/populate/default.nix b/krebs/5pkgs/simple/populate/default.nix index 3989585ab..78ee2f042 100644 --- a/krebs/5pkgs/simple/populate/default.nix +++ b/krebs/5pkgs/simple/populate/default.nix @@ -13,12 +13,12 @@ in stdenv.mkDerivation rec { name = "populate"; - version = "1.2.4"; + version = "1.2.5"; src = fetchgit { url = http://cgit.ni.krebsco.de/populate; rev = "refs/tags/v${version}"; - sha256 = "0az41vaxfwrh9l19z3cbc7in8pylrnyc0xkzk6773xg2nj4g8a28"; + sha256 = "10s4x117zp5whqq991xzw1i2jc1xhl580kx8hhzv8f1b4c9carx1"; }; phases = [ diff --git a/krebs/5pkgs/simple/quote.nix b/krebs/5pkgs/simple/quote.nix new file mode 100644 index 000000000..7731e14bf --- /dev/null +++ b/krebs/5pkgs/simple/quote.nix @@ -0,0 +1,13 @@ +{ jq, writeDashBin }: + +# usage: quote [ARGS...] +writeDashBin "quote" '' + set -efu + prefix= + for x; do + y=$(${jq}/bin/jq -nr --arg x "$x" '$x | @sh "\(.)"') + echo -n "$prefix$y" + prefix=' ' + done + echo +'' diff --git a/krebs/5pkgs/simple/withGetopt.nix b/krebs/5pkgs/simple/withGetopt.nix index 196e6765a..179051bdf 100644 --- a/krebs/5pkgs/simple/withGetopt.nix +++ b/krebs/5pkgs/simple/withGetopt.nix @@ -1,5 +1,5 @@ with import <stockholm/lib>; -{ utillinux, writeDash }: +{ coreutils, quote, utillinux, writeDash }: opt-spec: cmd-spec: let @@ -43,6 +43,9 @@ in writeDash wrapper-name '' unset ${opt.varname} '') opts)} + WITHGETOPT_ORIG_ARGS=$(${quote}/bin/quote "$@") + export WITHGETOPT_ORIG_ARGS + args=$(${utillinux}/bin/getopt \ -l ${shell.escape (concatMapStringsSep "," |