summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2016-08-02 20:24:45 +0200
committertv <tv@krebsco.de>2016-08-02 20:24:45 +0200
commitaa167d3e26bd4fd0fedc1ea94b7069cca2100181 (patch)
tree26078465cdae6a684ef086919745473950ee4870
parent6a91d7257b994d9a56e40bf1cd0af78f79473fd7 (diff)
lib: import shell from krebs/4lib
-rw-r--r--krebs/4lib/default.nix3
-rw-r--r--lib/default.nix7
-rw-r--r--lib/shell.nix (renamed from krebs/4lib/shell.nix)1
3 files changed, 8 insertions, 3 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/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/krebs/4lib/shell.nix b/lib/shell.nix
index 5910adacc..a8ff5dbe0 100644
--- a/krebs/4lib/shell.nix
+++ b/lib/shell.nix
@@ -1,6 +1,5 @@
{ lib, ... }:
-with builtins;
with lib;
rec {