Merge branch 'master' into staging

Haskell rebuild :-) Hydra: ?compare=1421865
2017-12-29 18:39:36 +01:00
parent 0ac589246a 805e25988f
commit a1a3e54ac9
18 changed files with 835 additions and 245 deletions
@@ -502,4 +502,7 @@ self: super: builtins.intersectAttrs super {
  partial-semigroup = dontCheck super.partial-semigroup;
  colour = dontCheck super.colour;

+  LDAP = dontCheck (overrideCabal super.LDAP (drv: {
+    librarySystemDepends = drv.librarySystemDepends or [] ++ [ pkgs.cyrus_sasl.dev ];
+  }));
 }