From 981664337fef772422cbc3ca8bcb8ebb85d79b02 Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 27 Jul 2015 21:36:15 +0200 Subject: default.nix: lib = import 4lib/krebs --- default.nix | 4 ++++ tv/lib/default.nix | 11 +++-------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/default.nix b/default.nix index 77c5ead2..b7468dbe 100644 --- a/default.nix +++ b/default.nix @@ -1,8 +1,12 @@ { user-name, system-name }: let + lib = import 4lib/krebs { + lib = import ; + }; eval = import { + 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 e0a295f1..dbc0c29b 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" -- cgit v1.2.3