ma: replace path to 2configs, init source.nix

1 files changed, 25 insertions, 16 deletions

diff --git a/makefu/source.nix b/makefu/source.nix
index 18733ee5c..a24af4dfb 100644
--- a/makefu/source.nix
+++ b/makefu/source.nix
@@ -1,29 +1,38 @@
 with import <stockholm/lib>;
-host@{ name, secure ? false, override ? {} }: let
+host@{ name, secure ? false, override ? {}, full ? false }: let
   builder = if getEnv "dummy_secrets" == "true"
               then "buildbot"
-              else "tv";
-  _file = <stockholm> + "/tv/1systems/${name}/source.nix";
+              else "makefu";
+  _file = <stockholm> + "/makefu/1systems/${name}/source.nix";
+  ref = "06734d1"; # unstable @ 2017-07-03 + graceful requests2 (a772c3aa)
+
 in
   evalSource (toString _file) [
     {
-      nixos-config.symlink = "stockholm/tv/1systems/${name}/config.nix";
-      nixpkgs.git = {
-        # nixos-17.03
-        ref = mkDefault "94941cb0455bfc50b1bf63186cfad7136d629f78";
-        url = https://github.com/NixOS/nixpkgs;
-      };
+      nixos-config.symlink = "stockholm/makefu/1systems/${name}/config.nix";
+      # always perform a full populate when buildbot
+      nixpkgs = if full || (builder == "buildbot" ) then {
+          git = {
+            url = https://github.com/makefu/nixpkgs;
+            inherit ref;
+          };
+        } else {
+          # TODO use http, once it is implemented
+          # right now it is simply extracted revision folder
+
+          ## prepare so we do not have to wait for rsync:
+          ## cd /var/src; curl https://github.com/nixos/nixpkgs/tarball/125ffff  -L | tar zx  && mv NixOS-nixpkgs-125ffff nixpkgs
+          file = "/home/makefu/store/${ref}";
+        };
+
       secrets.file = getAttr builder {
-        buildbot = toString <stockholm/tv/dummy_secrets>;
-        tv = "/home/tv/secrets/${name}";
+        buildbot = toString <stockholm/makefu/6tests/data/secrets>;
+        makefu = "/home/makefu/secrets/${name}";
       };
       stockholm.file = toString <stockholm>;
     }
-    (mkIf (builder == "tv") {
-      secrets-common.file = "/home/tv/secrets/common";
-    })
-    (mkIf (builder == "tv" && secure) {
-      secrets-master.file = "/home/tv/secrets/master";
+    (mkIf (builder == "makefu") {
+      secrets-common.file = "/home/makefu/secrets/common";
     })
     override
   ]