Merge pull request #98696 from marsam/init-postgresql_13
postgresql_13: init at 13.0
This commit is contained in:
commit
69978a02e1
@ -64,7 +64,7 @@ let
|
||||
(if atLeast "9.6" then ./patches/hardcode-pgxs-path-96.patch else ./patches/hardcode-pgxs-path.patch)
|
||||
./patches/specify_pkglibdir_at_runtime.patch
|
||||
./patches/findstring.patch
|
||||
] ++ lib.optional stdenv.isLinux ./patches/socketdir-in-run.patch;
|
||||
] ++ lib.optional stdenv.isLinux (if atLeast "13" then ./patches/socketdir-in-run-13.patch else ./patches/socketdir-in-run.patch);
|
||||
|
||||
installTargets = [ "install-world" ];
|
||||
|
||||
@ -144,7 +144,7 @@ let
|
||||
homepage = "https://www.postgresql.org";
|
||||
description = "A powerful, open source object-relational database system";
|
||||
license = licenses.postgresql;
|
||||
maintainers = with maintainers; [ ocharles thoughtpolice danbst globin ];
|
||||
maintainers = with maintainers; [ ocharles thoughtpolice danbst globin marsam ];
|
||||
platforms = platforms.unix;
|
||||
knownVulnerabilities = optional (!atLeast "9.4")
|
||||
"PostgreSQL versions older than 9.4 are not maintained anymore!";
|
||||
@ -221,4 +221,12 @@ in self: {
|
||||
inherit self;
|
||||
};
|
||||
|
||||
postgresql_13 = self.callPackage generic {
|
||||
version = "13.0";
|
||||
psqlSchema = "13";
|
||||
sha256 = "15i2b7m9a9430idqdgvrcyx66cpxz0v2d81nfqcm8ss3inz51rw0";
|
||||
this = self.postgresql_13;
|
||||
inherit self;
|
||||
};
|
||||
|
||||
}
|
||||
|
@ -0,0 +1,13 @@
|
||||
diff --git i/src/include/pg_config_manual.h w/src/include/pg_config_manual.h
|
||||
index 8f3ec6bde1..4fc01e4a0a 100644
|
||||
--- i/src/include/pg_config_manual.h
|
||||
+++ w/src/include/pg_config_manual.h
|
||||
@@ -201,7 +201,7 @@
|
||||
* support them yet.
|
||||
*/
|
||||
#ifndef WIN32
|
||||
-#define DEFAULT_PGSOCKET_DIR "/tmp"
|
||||
+#define DEFAULT_PGSOCKET_DIR "/run/postgresql"
|
||||
#else
|
||||
#define DEFAULT_PGSOCKET_DIR ""
|
||||
#endif
|
@ -16969,6 +16969,7 @@ in
|
||||
postgresql_10
|
||||
postgresql_11
|
||||
postgresql_12
|
||||
postgresql_13
|
||||
;
|
||||
postgresql = postgresql_11.override { this = postgresql; };
|
||||
postgresqlPackages = recurseIntoAttrs postgresql.pkgs;
|
||||
|
Loading…
Reference in New Issue
Block a user