From 7cc525b9157fea2b577ba1ded5cfa214c79c673d Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Thu, 31 Aug 2017 19:15:09 +0200
Subject: types.host: managed -> ci

---
 lib/types.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/types.nix b/lib/types.nix
index 8c68468..a9563cc 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -31,9 +31,10 @@ rec {
         default = null;
       };
 
-      managed = mkOption {
+      ci = mkOption {
         description = ''
-          If true, then the host's configuration is defined in stockholm.
+          If true, then the host wants to be tested by some CI system.
+          See <stockholm/krebs/2configs/buildbot-all.nix>
         '';
         type = bool;
         default = false;
-- 
cgit v1.2.3


From b0ad8ceec470b58a55a2fd0b906ebaa797ba02eb Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Thu, 31 Aug 2017 19:45:58 +0200
Subject: types.host: add external bool

---
 lib/types.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lib/types.nix b/lib/types.nix
index a9563cc..70570a6 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -40,6 +40,16 @@ rec {
         default = false;
       };
 
+      external = mkOption {
+        description = ''
+          Whether the host is defined externally (in contrast to being defined
+          in <stockholm>).  This is useful e.g. when legacy and/or adopted
+          hosts should be part of retiolum or some other component.
+        '';
+        type = bool;
+        default = false;
+      };
+
       owner = mkOption {
         type = user;
       };
-- 
cgit v1.2.3


From 7afd3bb396de740983a6531b8f1dbf6918a57de3 Mon Sep 17 00:00:00 2001
From: mv <mv@ni.r>
Date: Wed, 30 Aug 2017 18:03:15 +0200
Subject: mv nixpkgs: 94941cb -> 56da88a

---
 mv/source.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mv/source.nix b/mv/source.nix
index 8b15639..aa2b13f 100644
--- a/mv/source.nix
+++ b/mv/source.nix
@@ -10,7 +10,7 @@ in
       nixos-config.symlink = "stockholm/mv/1systems/${name}/config.nix";
       nixpkgs.git = {
         # nixos-17.03
-        ref = mkDefault "94941cb0455bfc50b1bf63186cfad7136d629f78";
+        ref = mkDefault "56da88a298a6f549701a10bb12072804a1ebfbd5";
         url = https://github.com/NixOS/nixpkgs;
       };
       secrets.file = getAttr builder {
-- 
cgit v1.2.3


From faa1141f3e5add73de6705849eaccbb59b547106 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 31 Aug 2017 18:08:14 +0200
Subject: mv dummy_secrets: init

---
 mv/dummy_secrets/default.nix | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 mv/dummy_secrets/default.nix

diff --git a/mv/dummy_secrets/default.nix b/mv/dummy_secrets/default.nix
new file mode 100644
index 0000000..0967ef4
--- /dev/null
+++ b/mv/dummy_secrets/default.nix
@@ -0,0 +1 @@
+{}
-- 
cgit v1.2.3