Merge remote-tracking branch 'cd/master'

2 files changed, 1 insertions, 24 deletions

diff --git a/krebs/4lib/default.nix b/krebs/4lib/default.nix
index f62c033b..49241cc8 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 5910adac..00000000
--- 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}";
-}