diff options
author | tv <tv@krebsco.de> | 2016-08-02 20:24:45 +0200 |
---|---|---|
committer | tv <tv@krebsco.de> | 2016-08-02 20:24:45 +0200 |
commit | aa167d3e26bd4fd0fedc1ea94b7069cca2100181 (patch) | |
tree | 26078465cdae6a684ef086919745473950ee4870 /krebs/4lib | |
parent | 6a91d7257b994d9a56e40bf1cd0af78f79473fd7 (diff) |
lib: import shell from krebs/4lib
Diffstat (limited to 'krebs/4lib')
-rw-r--r-- | krebs/4lib/default.nix | 3 | ||||
-rw-r--r-- | krebs/4lib/shell.nix | 22 |
2 files changed, 1 insertions, 24 deletions
diff --git a/krebs/4lib/default.nix b/krebs/4lib/default.nix index 296748333..8a822ed7d 100644 --- a/krebs/4lib/default.nix +++ b/krebs/4lib/default.nix @@ -3,7 +3,7 @@ with builtins; with lib; -let out = rec { +let out = import <stockholm/lib> // rec { eq = x: y: x == y; ne = x: y: x != y; @@ -34,7 +34,6 @@ let out = rec { genid = import ./genid.nix { lib = lib // out; }; git = import ./git.nix { lib = lib // out; }; - shell = import ./shell.nix { inherit lib; }; tree = import ./tree.nix { inherit lib; }; lpad = n: c: s: diff --git a/krebs/4lib/shell.nix b/krebs/4lib/shell.nix deleted file mode 100644 index 5910adacc..000000000 --- a/krebs/4lib/shell.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, ... }: - -with builtins; -with lib; - -rec { - escape = - let - isSafeChar = c: match "[-+./0-9:=A-Z_a-z]" c != null; - in - stringAsChars (c: - if isSafeChar c then c - else if c == "\n" then "'\n'" - else "\\${c}"); - - # - # shell script generators - # - - # example: "${cat (toJSON { foo = "bar"; })} | jq -r .foo" - cat = s: "printf '%s' ${escape s}"; -} |