summaryrefslogtreecommitdiffstats
path: root/default.nix
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2016-02-11 03:47:26 +0100
committertv <tv@krebsco.de>2016-02-11 03:47:26 +0100
commit0cf6d065f43c66efadd0a364c3414e6ecdae0004 (patch)
tree85b2af1878da06a7f1104e6f2d91439e179f2efc /default.nix
parent8b130a66287b829e7b6f9be0130df7231c7a6605 (diff)
*: turn 5pkgs into a(n optional) module
Diffstat (limited to 'default.nix')
-rw-r--r--default.nix6
1 files changed, 1 insertions, 5 deletions
diff --git a/default.nix b/default.nix
index b0ad60d8a..2aa0a8e14 100644
--- a/default.nix
+++ b/default.nix
@@ -43,16 +43,12 @@ let stockholm = {
imports = builtins.filter lib.dir.has-default-nix (lib.concatLists [
(map (f: f "2configs") [ lib.upath ])
(map (f: f "3modules") [ lib.kpath lib.upath ])
+ (map (f: f "5pkgs") [ lib.kpath lib.upath ])
]);
krebs.current.enable = true;
krebs.current.host = config.krebs.hosts.${current-host-name};
krebs.current.user = config.krebs.users.${current-user-name};
-
- nixpkgs.config.packageOverrides = pkgs: let
- kpkgs = import (lib.kpath "5pkgs") { inherit lib pkgs; };
- upkgs = import (lib.upath "5pkgs") { inherit lib; pkgs = pkgs // kpkgs; };
- in kpkgs // upkgs;
};
eval = config: import (lib.npath "nixos/lib/eval-config.nix") {