Merge remote-tracking branch 'prism/master'

1 files changed, 13 insertions, 0 deletions

diff --git a/krebs/4lib/types.nix b/krebs/4lib/types.nix
index 56d1d55c..66191d0b 100644
--- a/krebs/4lib/types.nix
+++ b/krebs/4lib/types.nix
@@ -286,6 +286,19 @@ types // rec {
     };
   };
 
+  haskell.conid = mkOptionType {
+    name = "Haskell constructor identifier";
+    check = x:
+      isString x && match "[[:upper:]][[:lower:]_[:upper:]0-9']*" x != null;
+    merge = mergeOneOption;
+  };
+
+  haskell.modid = mkOptionType {
+    name = "Haskell module identifier";
+    check = x: isString x && all haskell.conid.check (splitString "." x);
+    merge = mergeOneOption;
+  };
+
   # RFC952, B. Lexical grammar, <hname>
   hostname = mkOptionType {
     name = "hostname";