Merge master into staging-next

2019-06-09 12:28:52 +02:00
parent 480cd436fc e596a33dc0
commit d3afcac771
251 changed files with 8950 additions and 7143 deletions
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -102,7 +102,7 @@ let
        wrapProgram $out/bin/initdb --prefix PATH ":" ${glibc.bin}/bin
      '';

-    doCheck = true;
+    doCheck = !stdenv.isDarwin;
    # autodetection doesn't seem to able to find this, but it's there.
    checkTarget = "check";