Merge remote-tracking branch 'lass/master'

3 files changed, 48 insertions, 4 deletions

diff --git a/lib/default.nix b/lib/default.nix
index 149b97a72..280f04299 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -39,6 +39,8 @@ let
     ne = x: y: x != y;
     mod = x: y: x - y * (x / y);
 
+    on = b: u: x: y: b (u x) (u y);
+
     genid = lib.genid_uint32; # TODO remove
     genid_uint31 = x: ((lib.genid_uint32 x) + 16777216) / 2;
     genid_uint32 = import ./genid.nix { inherit lib; };
@@ -185,6 +187,30 @@ let
     in
       filter (x: x != []) ([acc.chunk] ++ acc.chunks);
 
+    # Filter adjacent duplicate elements.
+    uniq = uniqBy eq;
+
+    # Filter adjacent duplicate elements determined via the given function.
+    uniqBy = cmp: let
+      f = a: s:
+        if length s == 0 then
+          []
+        else let
+          b = head s;
+        in
+          if cmp a b then
+            f b (tail s)
+          else
+            [b] ++ f b (tail s);
+    in
+      s:
+        if length s == 0 then
+          []
+        else let
+          b = head s;
+        in
+          [b] ++ f b (tail s);
+
     warnOldVersion = oldName: newName:
       if compareVersions oldName newName != -1 then
         trace "Upstream `${oldName}' gets overridden by `${newName}'." newName
diff --git a/lib/haskell.nix b/lib/haskell.nix
index 4f0ee05ab..f87cfa761 100644
--- a/lib/haskell.nix
+++ b/lib/haskell.nix
@@ -39,7 +39,12 @@ rec {
         in
         if parse == null then
           (pkgs.writeText name s).overrideAttrs (old: {
-            dependencies = old.dependencies or [] ++ dependencies;
+            dependencies =
+              lib.uniq
+                (lib.sort (lib.on lib.lessThan (lib.getAttr "name"))
+                  (filter
+                    (lib.ne null)
+                    (old.dependencies or [] ++ dependencies)));
           })
 
         else
diff --git a/lib/types.nix b/lib/types.nix
index 67a0c6f1b..32b4541ae 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -18,9 +18,6 @@ rec {
         type = label;
         default = config._module.args.name;
       };
-      cores = mkOption {
-        type = uint;
-      };
       nets = mkOption {
         type = attrsOf net;
         default = {};
@@ -149,6 +146,14 @@ rec {
             }.${config._module.args.name} or {
               default = "${ip4.config.addr}/32";
             });
+            prefixLength = mkOption ({
+              type = uint;
+            } // {
+              retiolum.default = 16;
+              wiregrill.default = 16;
+            }.${config._module.args.name} or {
+              default = 32;
+            });
           };
         }));
         default = null;
@@ -168,6 +173,14 @@ rec {
             }.${config._module.args.name} or {
               default = "${ip6.config.addr}/128";
             });
+            prefixLength = mkOption ({
+              type = uint;
+            } // {
+              retiolum.default = 32;
+              wiregrill.default = 32;
+            }.${config._module.args.name} or {
+              default = 128;
+            });
           };
         }));
         default = null;