diff options
| author | lassulus <lassulus@lassul.us> | 2022-12-27 22:55:20 +0100 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2022-12-27 22:55:20 +0100 |
| commit | d34de27336482775a9c9ba45097a00eb1b00770e (patch) | |
| tree | 1e072f32909dac416ab46aaeaa3bc9502dbed6b5 /lib | |
| parent | ce2ec4448079b39842a740a2d40249e2498df012 (diff) | |
| parent | 02751cb50d2791be12476db14554a2093a52b6a0 (diff) | |
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/default.nix | 26 | ||||
| -rw-r--r-- | lib/haskell.nix | 7 |
2 files changed, 32 insertions, 1 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 |