Merge remote-tracking branch 'prism/master'

2 files changed, 4 insertions, 3 deletions

diff --git a/lib/default.nix b/lib/default.nix
index 4cb0332c..348d47e8 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -13,8 +13,9 @@ let
     ne = x: y: x != y;
     mod = x: y: x - y * (x / y);
 
-    genid = import ./genid.nix { inherit lib; };
-    genid_uint31 = x: ((lib.genid x) + 16777216) / 2;
+    genid = lib.genid_uint32; # TODO remove
+    genid_uint31 = x: ((lib.genid_uint32 x) + 16777216) / 2;
+    genid_uint32 = import ./genid.nix { inherit lib; };
 
     lpad = n: c: s:
       if lib.stringLength s < n
diff --git a/lib/types.nix b/lib/types.nix
index 01685330..41e75154 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -19,7 +19,7 @@ rec {
         default = config._module.args.name;
       };
       cores = mkOption {
-        type = positive;
+        type = uint;
       };
       nets = mkOption {
         type = attrsOf net;