From 27733e2bf626741fea9c33f4f5474e959b37ef76 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 24 Sep 2020 04:20:00 +0000 Subject: postgresql_13: init at 13.0 https://www.postgresql.org/docs/13/release-13.html --- pkgs/servers/sql/postgresql/default.nix | 10 +++++++++- .../sql/postgresql/patches/socketdir-in-run-13.patch | 13 +++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 pkgs/servers/sql/postgresql/patches/socketdir-in-run-13.patch (limited to 'pkgs/servers') diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index e759a62c2eb..dbe792e5157 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -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" ]; @@ -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; + }; + } diff --git a/pkgs/servers/sql/postgresql/patches/socketdir-in-run-13.patch b/pkgs/servers/sql/postgresql/patches/socketdir-in-run-13.patch new file mode 100644 index 00000000000..72c778b0758 --- /dev/null +++ b/pkgs/servers/sql/postgresql/patches/socketdir-in-run-13.patch @@ -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 -- cgit 1.4.1 From 8f9d4f3fc68b6776edcafb99fd8a31cce31906b0 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 24 Sep 2020 04:20:00 +0000 Subject: postgresql: add marsam as maintainer --- pkgs/servers/sql/postgresql/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index dbe792e5157..bc1108ad333 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -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!"; -- cgit 1.4.1