Merge remote-tracking branch 'nomic/user-toplevel' into newmaster

3modules/krebs/default.nix

@@ -154,8 +154,7 @@ let
     # TODO search-domains :: listOf hostname
     search-domain = mkOption {
       type = types.hostname;
-      default = "";
-      example = "retiolum";
+      default = "retiolum";
     };
   };
 

4lib/krebs/types.nix

@@ -93,6 +93,10 @@ types // rec {
       pubkey = mkOption {
         type = str;
       };
+      pubkeys = mkOption {
+        type = attrsOf str;
+        default = {};
+      };
     };
   };
 

default.nix

@@ -4,10 +4,10 @@ let
 
   eval = import <nixpkgs/nixos/lib/eval-config.nix> {
     system = builtins.currentSystem;
-    modules = [
-      (./1systems + "/${user-name}/${system-name}.nix")
-      (./3modules/krebs)
-      (./3modules + "/${user-name}")
+    modules = map (p: ./. + "/${p}") [
+      "${user-name}/systems/${system-name}.nix"
+      "${user-name}/modules"
+      "3modules/krebs"
     ];
   };
 

tv/configs/base.nix

@@ -10,7 +10,6 @@ in
 
 {
   krebs.enable = true;
-  krebs.search-domain = "retiolum";
 
   networking.hostName = config.krebs.build.host.name;
 

tv/pkgs/lentil/1.patch

@@ -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]
-

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;
       }));
     };
   };