Merge branch 'master.upstream' into staging.upstream

2015-06-30 23:58:07 -07:00
parent 857efa12fb ddf15bc78a
commit 612f0bdd67
71 changed files with 1388 additions and 1461 deletions
--- a/pkgs/servers/sql/postgresql/9.4.x.nix
+++ b/pkgs/servers/sql/postgresql/9.4.x.nix
@@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
  makeFlags = [ "world" ];

  configureFlags = [ "--with-openssl" ]
+                   ++ optional (stdenv.isDarwin)  "--with-uuid=e2fs"
                   ++ optional (!stdenv.isDarwin) "--with-ossp-uuid";

  patches = [ ./disable-resolve_symlinks-94.patch ./less-is-more.patch ];