summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2015-07-28 20:27:24 +0200
committermakefu <github@syntax-fehler.de>2015-07-28 20:27:24 +0200
commitfca517dd0e61c67d2a485f578e7146b46f048f69 (patch)
treeca9443a41f91bba218cf614d3ed6011314d704da
parenta8724063ff3651aaf129acd498b2afdcdecb4ca2 (diff)
parenta7ff77b6c147be71d60bda7e73c65286ecfb7c83 (diff)
Merge remote-tracking branch 'cd/user-toplevel' into user-toplevel
-rw-r--r--default.nix4
-rw-r--r--tv/lib/default.nix11
2 files changed, 7 insertions, 8 deletions
diff --git a/default.nix b/default.nix
index 77c5ead22..b7468dbe7 100644
--- a/default.nix
+++ b/default.nix
@@ -1,8 +1,12 @@
{ user-name, system-name }:
let
+ lib = import 4lib/krebs {
+ lib = import <nixpkgs/lib>;
+ };
eval = import <nixpkgs/nixos/lib/eval-config.nix> {
+ inherit lib;
system = builtins.currentSystem;
modules = map (p: ./. + "/${p}") [
"${user-name}/systems/${system-name}.nix"
diff --git a/tv/lib/default.nix b/tv/lib/default.nix
index e0a295f17..dbc0c29b7 100644
--- a/tv/lib/default.nix
+++ b/tv/lib/default.nix
@@ -1,16 +1,11 @@
{ lib, pkgs, ... }:
-let
- krebs = import ../../4lib/krebs { inherit lib; };
-in
+with lib;
-with krebs;
-
-krebs // rec {
+lib // rec {
git = import ./git.nix {
- lib = krebs;
- inherit pkgs;
+ inherit lib pkgs;
};
# "7.4.335" -> "74"