From aa167d3e26bd4fd0fedc1ea94b7069cca2100181 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 2 Aug 2016 20:24:45 +0200
Subject: lib: import shell from krebs/4lib

---
 krebs/4lib/default.nix |  3 +--
 krebs/4lib/shell.nix   | 22 ----------------------
 lib/default.nix        |  7 +++++++
 lib/shell.nix          | 21 +++++++++++++++++++++
 4 files changed, 29 insertions(+), 24 deletions(-)
 delete mode 100644 krebs/4lib/shell.nix
 create mode 100644 lib/default.nix
 create mode 100644 lib/shell.nix

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}";
-}
diff --git a/lib/default.nix b/lib/default.nix
new file mode 100644
index 000000000..6c607f13b
--- /dev/null
+++ b/lib/default.nix
@@ -0,0 +1,7 @@
+let
+  lib = import <nixpkgs/lib> // builtins // {
+    shell = import ./shell.nix { inherit lib; };
+  };
+in
+
+lib
diff --git a/lib/shell.nix b/lib/shell.nix
new file mode 100644
index 000000000..a8ff5dbe0
--- /dev/null
+++ b/lib/shell.nix
@@ -0,0 +1,21 @@
+{ lib, ... }:
+
+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}";
+}
-- 
cgit v1.2.3