diff options
author | tv <tv@shackspace.de> | 2015-07-27 21:36:15 +0200 |
---|---|---|
committer | tv <tv@shackspace.de> | 2015-07-27 21:36:15 +0200 |
commit | 981664337fef772422cbc3ca8bcb8ebb85d79b02 (patch) | |
tree | 9a480eb7dbb9e6af6760560b34a9b0d47a8a7410 | |
parent | 5a03593b3a6eb97d2f369424b2631ad122b8de85 (diff) |
default.nix: lib = import 4lib/krebs
-rw-r--r-- | default.nix | 4 | ||||
-rw-r--r-- | tv/lib/default.nix | 11 |
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" |