Merge remote-tracking branch 'cd/master'

13 files changed, 26 insertions, 8 deletions

diff --git a/shared/1systems/test-all-krebs-modules.nix b/shared/1systems/test-all-krebs-modules.nix
index b98004dfe..e1021c7e0 100644
--- a/shared/1systems/test-all-krebs-modules.nix
+++ b/shared/1systems/test-all-krebs-modules.nix
@@ -2,6 +2,9 @@
 let
   en = { enable = true;};
 in {
+  imports = [
+    ../.
+  ];
   krebs = {
     enable = true;
     build.user = config.krebs.users.shared;
diff --git a/shared/1systems/test-arch.nix b/shared/1systems/test-arch.nix
index ece209490..14fc0384b 100644
--- a/shared/1systems/test-arch.nix
+++ b/shared/1systems/test-arch.nix
@@ -2,6 +2,7 @@
 
 {
   imports = [
+    ../.
     ../2configs/base.nix
     {
       boot.loader.grub = {
diff --git a/shared/1systems/test-centos6.nix b/shared/1systems/test-centos6.nix
index a8b5f9b9c..8add0b7c1 100644
--- a/shared/1systems/test-centos6.nix
+++ b/shared/1systems/test-centos6.nix
@@ -7,6 +7,7 @@ let
   gw = "168.235.148.1";
 in {
   imports = [
+    ../.
     ../2configs/base.nix
     ../2configs/os-templates/CAC-CentOS-6.5-64bit.nix
     {
diff --git a/shared/1systems/test-centos7.nix b/shared/1systems/test-centos7.nix
index 48cecc877..65daff509 100644
--- a/shared/1systems/test-centos7.nix
+++ b/shared/1systems/test-centos7.nix
@@ -5,6 +5,7 @@ let
 
 in {
   imports = [
+    ../.
     ../2configs/base.nix
     ../2configs/os-templates/CAC-CentOS-7-64bit.nix
     ../2configs/temp/networking.nix
diff --git a/shared/1systems/test-failing.nix b/shared/1systems/test-failing.nix
index 81a9e48d6..fe1c2cb65 100644
--- a/shared/1systems/test-failing.nix
+++ b/shared/1systems/test-failing.nix
@@ -1,6 +1,9 @@
 { config, pkgs, ... }:
 
 {
+  imports = [
+    ../.
+  ];
   programs.ssh.startAgent = true;
   programs.ssh.startAgent = false;
 }
diff --git a/shared/1systems/test-minimal-deploy.nix b/shared/1systems/test-minimal-deploy.nix
index 309e28950..bec2b38d5 100644
--- a/shared/1systems/test-minimal-deploy.nix
+++ b/shared/1systems/test-minimal-deploy.nix
@@ -1,5 +1,8 @@
 { config, pkgs, lib, ... }:
 {
+  imports = [
+    ../.
+  ];
   krebs = {
     enable = true;
     build.user = config.krebs.users.shared;
diff --git a/shared/1systems/wolf.nix b/shared/1systems/wolf.nix
index 588ec1b55..96691aed8 100644
--- a/shared/1systems/wolf.nix
+++ b/shared/1systems/wolf.nix
@@ -6,6 +6,7 @@ let
 in
 {
   imports = [
+    ../.
     ../2configs/base.nix
     <nixpkgs/nixos/modules/profiles/qemu-guest.nix>
     ../2configs/collectd-base.nix
diff --git a/shared/2configs/base.nix b/shared/2configs/base.nix
index 715397ed5..9f998b554 100644
--- a/shared/2configs/base.nix
+++ b/shared/2configs/base.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 {
   krebs.enable = true;
   krebs.retiolum = {
@@ -16,7 +16,7 @@ with lib;
   # TODO rename shared user to "krebs"
   krebs.build.user = mkDefault config.krebs.users.shared;
   krebs.build.source = {
-    upstream-nixpkgs = mkDefault {
+    nixpkgs = mkDefault {
       url = https://github.com/NixOS/nixpkgs;
       rev = "77f8f35d57618c1ba456d968524f2fb2c3448295"; # for urlwatch-minidb
     };
@@ -24,8 +24,6 @@ with lib;
     stockholm = mkDefault "${getEnv "HOME"}/stockholm";
 
     nixos-config = "symlink:stockholm/${config.krebs.build.user.name}/1systems/${config.krebs.build.host.name}.nix";
-    nixpkgs = symlink:stockholm/nixpkgs;
-    stockholm-user = "symlink:stockholm/${config.krebs.build.user.name}";
   };
 
   networking.hostName = config.krebs.build.host.name;
diff --git a/shared/2configs/cgit-mirror.nix b/shared/2configs/cgit-mirror.nix
index 0794ee411..b984535c9 100644
--- a/shared/2configs/cgit-mirror.nix
+++ b/shared/2configs/cgit-mirror.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 let
   rules = with git; singleton {
     user = [ wolf-repo-sync ];
diff --git a/shared/2configs/collectd-base.nix b/shared/2configs/collectd-base.nix
index 3b792bf23..9c63dcd20 100644
--- a/shared/2configs/collectd-base.nix
+++ b/shared/2configs/collectd-base.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 # TODO: krebs.collectd.plugins
-with lib;
+with config.krebs.lib;
 let
   connect-time-cfg = with pkgs; writeText "collectd-connect-time.conf" ''
     LoadPlugin python
diff --git a/shared/2configs/graphite.nix b/shared/2configs/graphite.nix
index 707ec6e9a..37c6b09fd 100644
--- a/shared/2configs/graphite.nix
+++ b/shared/2configs/graphite.nix
@@ -5,7 +5,7 @@
 
 # TODO: krebs.graphite.minimal.enable
 # TODO: configure firewall
-with lib;
+with config.krebs.lib;
 {
   imports = [ ];
 
diff --git a/shared/2configs/shared-buildbot.nix b/shared/2configs/shared-buildbot.nix
index 19724ac01..ebf5f4a1e 100644
--- a/shared/2configs/shared-buildbot.nix
+++ b/shared/2configs/shared-buildbot.nix
@@ -64,7 +64,7 @@
   # prepare nix-shell
   # the dependencies which are used by the test script
   deps = [ "gnumake", "jq","nix","rsync",
-            "(import <stockholm> {}).pkgs.test.infest-cac-centos7" ]
+            "(import <stockholm>).pkgs.test.infest-cac-centos7" ]
   # TODO: --pure , prepare ENV in nix-shell command:
   #                   SSL_CERT_FILE,LOGNAME,NIX_REMOTE
   nixshell = ["nix-shell",
diff --git a/shared/default.nix b/shared/default.nix
new file mode 100644
index 000000000..69b4abaac
--- /dev/null
+++ b/shared/default.nix
@@ -0,0 +1,7 @@
+_:
+{
+  imports = [
+    ../krebs
+    ./3modules
+  ];
+}