From 625f00d75328a73d36c7f21bc15921115b991e68 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 8 Feb 2024 04:20:00 +0000 Subject: [PATCH 1/6] postgresql_12: 12.17 -> 12.18 Changelog: https://www.postgresql.org/docs/release/12.18/ --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 11fae33a6edd..37473dbe9275 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -366,9 +366,9 @@ let mkPackages = self: { postgresql_12 = self.callPackage generic { - version = "12.17"; + version = "12.18"; psqlSchema = "12"; - hash = "sha256-k+jhsjmB1fA8bFdj93soGEwc5NtxlPpGbi7bZdnBxfY="; + hash = "sha256-T5kZcl2UHOmGjgf+HtHTqGdIWZtIM4ZUdYOSi3TDkYo="; this = self.postgresql_12; thisAttr = "postgresql_12"; inherit self; From aa9a97dc17758d9bea4bc0a2db80ac099e53fef1 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 8 Feb 2024 04:20:00 +0000 Subject: [PATCH 2/6] postgresql_13: 13.13 -> 13.14 Changelog: https://www.postgresql.org/docs/release/13.14/ --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 37473dbe9275..ab475865a8c2 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -375,9 +375,9 @@ let }; postgresql_13 = self.callPackage generic { - version = "13.13"; + version = "13.14"; psqlSchema = "13"; - hash = "sha256-ivacJZkEeirSRlZ9aOxBMa7xFpVNjD5GnpeJCAs3pHQ="; + hash = "sha256-uN8HhVGJiWC9UA3F04oXfpkFN234H+fytmChQH+mpe0="; this = self.postgresql_13; thisAttr = "postgresql_13"; inherit self; From 60a659a0c3fdbc1e78108046d50b060b080a4bad Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 8 Feb 2024 04:20:00 +0000 Subject: [PATCH 3/6] postgresql_14: 14.10 -> 14.11 Changelog: https://www.postgresql.org/docs/release/14.11/ --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index ab475865a8c2..efbbe368c04a 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -384,9 +384,9 @@ let }; postgresql_14 = self.callPackage generic { - version = "14.10"; + version = "14.11"; psqlSchema = "14"; - hash = "sha256-yZQxxI6dRwsNCrlG6yFBo80ZEwwvtNxLMoSnd07Mg5k="; + hash = "sha256-pnC9fc4i3K1Cl7JhE2s7HUoJpvVBcZViqhTKY78paKg="; this = self.postgresql_14; thisAttr = "postgresql_14"; inherit self; From 2ad23c3f31409d01fd4fcc8afdd8b21dcd32de15 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 8 Feb 2024 04:20:00 +0000 Subject: [PATCH 4/6] postgresql_15: 15.5 -> 15.6 Changelog: https://www.postgresql.org/docs/release/15.6/ --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index efbbe368c04a..f940ac00beaa 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -393,9 +393,9 @@ let }; postgresql_15 = self.callPackage generic { - version = "15.5"; + version = "15.6"; psqlSchema = "15"; - hash = "sha256-j1OqldeOuOglNupGtoGHeTtCu6O09lqjQvVAsjybEKY="; + hash = "sha256-hFUUbtnGnJOlfelUrq0DAsr60DXCskIXXWqh4X68svs="; this = self.postgresql_15; thisAttr = "postgresql_15"; inherit self; From cbb254b9f0db9572d3294c46c8b641e57df6adba Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 8 Feb 2024 04:20:00 +0000 Subject: [PATCH 5/6] postgresql_16: 16.1 -> 16.2 Changelog: https://www.postgresql.org/docs/release/16.2/ --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index f940ac00beaa..e256fa3727b8 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -402,9 +402,9 @@ let }; postgresql_16 = self.callPackage generic { - version = "16.1"; + version = "16.2"; psqlSchema = "16"; - hash = "sha256-zjxNhdGbASH+DT+O8fpgH3GYnob4pm99w61UbdVWT+w="; + hash = "sha256-RG6IKU28LJCFq0twYaZG+mBLS+wDUh1epnHC5a2bKVI="; this = self.postgresql_16; thisAttr = "postgresql_16"; inherit self; From 2526c59458774d19f3faf290ad70ce6f6f01d24d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 8 Feb 2024 04:20:00 +0000 Subject: [PATCH 6/6] Revert "postgresql: Fix build with libxml2 2.12" This reverts commit 2ed47724a666d908a671e1acdbddc85cc79fa249. --- pkgs/servers/sql/postgresql/default.nix | 11 ---------- .../postgresql/patches/libxml2.12-15.patch | 22 ------------------- 2 files changed, 33 deletions(-) delete mode 100644 pkgs/servers/sql/postgresql/patches/libxml2.12-15.patch diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index e256fa3727b8..700f0ad99bd1 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -115,17 +115,6 @@ let ./patches/specify_pkglibdir_at_runtime.patch ./patches/findstring.patch - # Fix build with libxml2 2.12.0 and -Wincompatible-function-pointer-types - (if atLeast "16" then - # https://www.postgresql.org/message-id/CACpMh%2BDMZVHM%2BiDSyqdcpK8sr7jd_HxxLJRNvGTzcLBE0W07QA%40mail.gmail.com - fetchurl { - url = "https://www.postgresql.org/message-id/attachment/152769/v1-0001-Make-PostgreSQL-work-with-newer-version-of-libxml.patch"; - hash = "sha256-1j5mtG++hFmYwfS98PdN1SmNI4T86q4FXvKLz2VeJyg="; - } - else - ./patches/libxml2.12-15.patch - ) - (substituteAll { src = ./locale-binary-path.patch; locale = "${if stdenv.isDarwin then darwin.adv_cmds else lib.getBin stdenv.cc.libc}/bin/locale"; diff --git a/pkgs/servers/sql/postgresql/patches/libxml2.12-15.patch b/pkgs/servers/sql/postgresql/patches/libxml2.12-15.patch deleted file mode 100644 index 13438c7d4bb7..000000000000 --- a/pkgs/servers/sql/postgresql/patches/libxml2.12-15.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c -index 6411f56b998..0eb39fcfc26 100644 ---- a/src/backend/utils/adt/xml.c -+++ b/src/backend/utils/adt/xml.c -@@ -119,7 +119,7 @@ struct PgXmlErrorContext - - static xmlParserInputPtr xmlPgEntityLoader(const char *URL, const char *ID, - xmlParserCtxtPtr ctxt); --static void xml_errorHandler(void *data, xmlErrorPtr error); -+static void xml_errorHandler(void *data, const xmlError *error); - static void xml_ereport_by_code(int level, int sqlcode, - const char *msg, int errcode); - static void chopStringInfoNewlines(StringInfo str); -@@ -1749,7 +1749,7 @@ xml_ereport(PgXmlErrorContext *errcxt, int level, int sqlcode, const char *msg) - * Error handler for libxml errors and warnings - */ - static void --xml_errorHandler(void *data, xmlErrorPtr error) -+xml_errorHandler(void *data, const xmlError *error) - { - PgXmlErrorContext *xmlerrcxt = (PgXmlErrorContext *) data; - xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) error->ctxt;