summaryrefslogtreecommitdiffstats
path: root/krebs/4lib
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-08-02 20:41:47 +0200
committerlassulus <lass@aidsballs.de>2016-08-02 20:41:47 +0200
commit2a263f14abf8baff0cc686b1dd11a349da87f067 (patch)
treecdc5a429dcaa92b8d5536642d58c4b1a2835e83d /krebs/4lib
parent127b8c0989f1dc71313af67fb5e69c709df019f3 (diff)
parent0928cc03a6191640c66c9122159994855527faef (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'krebs/4lib')
-rw-r--r--krebs/4lib/default.nix3
-rw-r--r--krebs/4lib/shell.nix22
2 files changed, 1 insertions, 24 deletions
diff --git a/krebs/4lib/default.nix b/krebs/4lib/default.nix
index f62c033bd..49241cc82 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;
@@ -35,7 +35,6 @@ let out = rec {
genid = import ./genid.nix { lib = lib // out; };
genid_signed = x: ((genid x) + 16777216) / 2;
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}";
-}