From da5506a708d99476c82700675b35d7079763020d Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 27 Jul 2015 15:42:33 +0200
Subject: krebs.types.user: add pubkeys

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

diff --git a/4lib/krebs/types.nix b/4lib/krebs/types.nix
index 970ef2f..92410dd 100644
--- a/4lib/krebs/types.nix
+++ b/4lib/krebs/types.nix
@@ -93,6 +93,10 @@ types // rec {
       pubkey = mkOption {
         type = str;
       };
+      pubkeys = mkOption {
+        type = attrsOf str;
+        default = {};
+      };
     };
   };
 
-- 
cgit v1.2.3


From 300dcb9ef35ba89b03f0a01cbefdf299bd5faef2 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 27 Jul 2015 16:05:41 +0200
Subject: krebs.build.search-domain: s/example/default/

---
 3modules/krebs/default.nix | 3 +--
 tv/configs/base.nix        | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/3modules/krebs/default.nix b/3modules/krebs/default.nix
index d32143b..2b20613 100644
--- a/3modules/krebs/default.nix
+++ b/3modules/krebs/default.nix
@@ -151,8 +151,7 @@ let
     # TODO search-domains :: listOf hostname
     search-domain = mkOption {
       type = types.hostname;
-      default = "";
-      example = "retiolum";
+      default = "retiolum";
     };
   };
 
diff --git a/tv/configs/base.nix b/tv/configs/base.nix
index 06f83ea..997d4c2 100644
--- a/tv/configs/base.nix
+++ b/tv/configs/base.nix
@@ -10,7 +10,6 @@ in
 
 {
   krebs.enable = true;
-  krebs.search-domain = "retiolum";
 
   networking.hostName = config.krebs.build.host.name;
 
-- 
cgit v1.2.3


From 12fef7dc552c2399d9a54f4ff68b78be6ff812c3 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 27 Jul 2015 16:26:50 +0200
Subject: krebs.build.script: update system profile

---
 3modules/krebs/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/3modules/krebs/default.nix b/3modules/krebs/default.nix
index 2b20613..32c9368 100644
--- a/3modules/krebs/default.nix
+++ b/3modules/krebs/default.nix
@@ -107,15 +107,18 @@ let
                 '') config.deps)}
 
               echo build system...
+              profile=/nix/var/nix/profiles/system
               NIX_PATH=/root/src \
-              nix-build \
+              nix-env \
                 -Q \
+                -p "$profile" \
+                -f '<stockholm>' \
+                --set \
                 -A system \
-                '<stockholm>' \
                 --argstr user-name ${escapeShellArg cfg.build.user.name} \
                 --argstr system-name ${escapeShellArg cfg.build.host.name}
 
-              exec result/bin/switch-to-configuration switch
+              exec "$profile"/bin/switch-to-configuration switch
               EOF
             '';
           };
-- 
cgit v1.2.3


From 841ecb7d5b7e0627f8f145e404359ef2f8aa35fa Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 27 Jul 2015 17:49:02 +0200
Subject: tv pkgs lentil: 0.1.2.7 -> 0.1.3.0

---
 tv/pkgs/lentil/1.patch     | 39 ---------------------------------------
 tv/pkgs/lentil/default.nix |  6 ++----
 2 files changed, 2 insertions(+), 43 deletions(-)
 delete mode 100644 tv/pkgs/lentil/1.patch

diff --git a/tv/pkgs/lentil/1.patch b/tv/pkgs/lentil/1.patch
deleted file mode 100644
index 1ed9818..0000000
--- a/tv/pkgs/lentil/1.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -rN -u old-lentil/src/Lentil/File.hs new-lentil/src/Lentil/File.hs
---- old-lentil/src/Lentil/File.hs	2015-07-20 22:43:23.177620724 +0200
-+++ new-lentil/src/Lentil/File.hs	2015-07-20 22:43:23.177620724 +0200
-@@ -13,10 +13,13 @@
- import Lentil.Types
- import Lentil.Parse.Run
-
-+import System.Directory
- import System.FilePath
- import System.FilePath.Find
-+import Data.Either
- import Data.Monoid
- import Control.Applicative
-+import Control.Exception.Base
-
- import qualified Data.List as L
-
-@@ -36,7 +39,12 @@
- --------------
-
- findIssues :: [FilePath] -> [FilePath] -> IO [Issue]
--findIssues is xs = find always (findClause is xs) "." >>= issueFinder
-+findIssues is xs =
-+  (mapM (try . canonicalizePath) is :: IO [Either SomeException FilePath]) >>=
-+  return . rights >>=
-+  mapM (\i -> find always (findClause [i] xs) i) >>=
-+  return . concat >>=
-+  issueFinder
-
- -- fp to include, fp to exclude, clause
- findClause :: [FilePath] -> [FilePath] -> FindClause Bool
-@@ -47,6 +55,6 @@
-                     (not <$> fmap getAny xc)
-     where
-           fp2fc :: FilePath -> FindClause Any
--          fp2fc f = Any . L.isPrefixOf (combine "." f) <$> filePath
-+          fp2fc f = Any . L.isPrefixOf f <$> filePath
-           -- TODO: combine funziona su windows? [feature:intermediate]
-
diff --git a/tv/pkgs/lentil/default.nix b/tv/pkgs/lentil/default.nix
index 1385cbd..fc9b4fd 100644
--- a/tv/pkgs/lentil/default.nix
+++ b/tv/pkgs/lentil/default.nix
@@ -4,13 +4,11 @@
   overrides = self: super: {
     lentil = super.lentil.override {
       mkDerivation = (attrs: self.mkDerivation (attrs // {
-        version = "0.1.2.7";
-        sha256 = "1g3if2y41li6wyg7ffvpybqvbywiq8bf5b5fb6pz499hinzahb9d";
+        version = "0.1.3.0";
+        sha256 = "0xa59avh0bvfg69xh9p5b8dppfhx29mvfq8v41sk9j7qbcnzjivg";
         patches = [
-          ./1.patch
           ./syntaxes.patch
         ];
-        doCheck = false;
       }));
     };
   };
-- 
cgit v1.2.3