summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@shackspace.de>2015-08-29 00:17:25 +0200
committertv <tv@shackspace.de>2015-08-29 00:20:42 +0200
commit81eaf7a9e7b083c169828590d0d848cf933b32e0 (patch)
treeee3215a194cfc59808e01b339cbf31bcfee4604a
parent144fcda288eb050153620c386511c7722e031029 (diff)
one pkgs to rule them all
-rw-r--r--default.nix6
-rw-r--r--krebs/3modules/github-hosts-sync.nix6
-rw-r--r--krebs/5pkgs/default.nix1
3 files changed, 8 insertions, 5 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; });
+ })
];
};
diff --git a/krebs/3modules/github-hosts-sync.nix b/krebs/3modules/github-hosts-sync.nix
index 207b937de..dbc0cc1de 100644
--- a/krebs/3modules/github-hosts-sync.nix
+++ b/krebs/3modules/github-hosts-sync.nix
@@ -61,9 +61,9 @@ let
${cfg.ssh-identity-file} \
"$ssh_identity_file_target"
- ln -snf ${kpkgs.github-known_hosts} ${cfg.dataDir}/.ssh/known_hosts
+ ln -snf ${pkgs.github-known_hosts} ${cfg.dataDir}/.ssh/known_hosts
'';
- ExecStart = "${kpkgs.github-hosts-sync}/bin/github-hosts-sync";
+ ExecStart = "${pkgs.github-hosts-sync}/bin/github-hosts-sync";
};
};
@@ -77,7 +77,5 @@ let
name = "github-hosts-sync";
uid = 3220554646; # genid github-hosts-sync
};
-
- kpkgs = import ../../krebs/5pkgs { inherit lib pkgs; };
in
out
diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index 54604382f..2f7a24ed2 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -6,7 +6,6 @@ let
inherit (pkgs) callPackage;
in
-pkgs //
rec {
cac = callPackage ./cac.nix {};
dic = callPackage ./dic.nix {};