Merge commit '18aa59b0f26fc707e7313f8467e67159e61600c2' from master into staging

There was one conflict in the NixOS manual; I checked that it still built after resolving it.
2019-04-01 00:40:03 -04:00
parent 7551417592 18aa59b0f2
commit 4ccb74011f
319 changed files with 5657 additions and 2610 deletions
@@ -60,7 +60,7 @@ let
        (if atLeast "9.6" then ./patches/less-is-more-96.patch             else ./patches/less-is-more.patch)
        (if atLeast "9.6" then ./patches/hardcode-pgxs-path-96.patch       else ./patches/hardcode-pgxs-path.patch)
        ./patches/specify_pkglibdir_at_runtime.patch
-      ];
+      ] ++ lib.optional stdenv.isLinux ./patches/socketdir-in-run.patch;

    installTargets = [ "install-world" ];