public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit '18aa59b0f26fc707e7313f8467e67159e61600c2' from master into staging

Browse Source 
There was one conflict in the NixOS manual; I checked that it still
built after resolving it.
This commit is contained in:
John Ericson
2019-04-01 00:24:46 -04:00
parent 7551417592 18aa59b0f2
commit 4ccb74011f
319 changed files with 5657 additions and 2610 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/servers/sql/postgresql/default.nix
View File

@@ -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" ];

13
pkgs/servers/sql/postgresql/patches/socketdir-in-run.patch Normal file
View File

@@ -0,0 +1,13 @@
diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h
index 743401cb96..be5c5f61d2 100644
--- a/src/include/pg_config_manual.h
+++ b/src/include/pg_config_manual.h
@@ -179,7 +179,7 @@
* here's where to twiddle it. You can also override this at runtime
* with the postmaster's -k switch.
*/
-#define DEFAULT_PGSOCKET_DIR "/tmp"
+#define DEFAULT_PGSOCKET_DIR "/run/postgresql"
/*
* This is the default event source for Windows event log.