diff options
| author | makefu <github@syntax-fehler.de> | 2015-08-31 10:47:29 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2015-08-31 10:47:29 +0200 |
| commit | 2eb8bcf9d1c293a8b28730c9a12d9a857c5a43a7 (patch) | |
| tree | c8a1d55a148e59f51a400e0d5dc11780d4e4005c /default.nix | |
| parent | 0acd7f23e1e3adf4bf1427f186a7bf5505ff910d (diff) | |
| parent | 83f06535de527c7470f8ff9c8b5e3a4632cf7cb9 (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'default.nix')
| -rw-r--r-- | default.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/default.nix b/default.nix index 59a76f81b..875f0d5b4 100644 --- a/default.nix +++ b/default.nix @@ -8,6 +8,12 @@ let "${user-name}/1systems/${system-name}.nix" "${user-name}/3modules" "krebs/3modules" + ] ++ [ + ({ lib, pkgs, ... }: { + _module.args.pkgs = + (import ./krebs/5pkgs { inherit lib pkgs; }) // + (import (./. + "/${user-name}/5pkgs") { inherit lib pkgs; }); + }) ]; }; |