From ae563740682ca07e3e22cc115ad16f12dcdece3c Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 4 Sep 2025 10:15:15 +0200 Subject: [PATCH 1/3] postgresql_18: 18beta3 -> 18rc1 Release Notes for v18: https://www.postgresql.org/docs/18/release-18.html --- pkgs/servers/sql/postgresql/18.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/18.nix b/pkgs/servers/sql/postgresql/18.nix index 9b8dbda07e9c..46211a7b5fae 100644 --- a/pkgs/servers/sql/postgresql/18.nix +++ b/pkgs/servers/sql/postgresql/18.nix @@ -1,7 +1,7 @@ import ./generic.nix { - version = "18beta2"; - rev = "refs/tags/REL_18_BETA3"; - hash = "sha256-QpJONriQnRN75cCcsdu9TGt8Km7NQLs5diZx1pVruc4="; + version = "18rc1"; + rev = "refs/tags/REL_18_RC1"; + hash = "sha256-PDycGuKrEa00N1h/BsWUiwG7naE0f2wFFXpQSOhs/hY="; muslPatches = { dont-use-locale-a = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql17/dont-use-locale-a-on-musl.patch?id=d69ead2c87230118ae7f72cef7d761e761e1f37e"; From 296f222cf8924d8c2ca52d19e962b673b39cac84 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 4 Sep 2025 10:48:14 +0200 Subject: [PATCH 2/3] postgresql18Packages.pg_hll: fix on darwin Disabling the `missing-variable-declarations` warning only was part of the solution, it didn't fix darwin builds. Applying upstream's patch fixes it on all platforms. It will also warn us via build failure when this isn't needed anymore. Win-win! --- pkgs/servers/sql/postgresql/ext/pg_hll.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_hll.nix b/pkgs/servers/sql/postgresql/ext/pg_hll.nix index bd3bd7bcdb09..0354b6c337af 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_hll.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_hll.nix @@ -1,5 +1,6 @@ { fetchFromGitHub, + fetchpatch, lib, postgresql, postgresqlBuildExtension, @@ -16,8 +17,13 @@ postgresqlBuildExtension (finalAttrs: { hash = "sha256-Latdxph1Ura8yKEokEjalJ+/GY+pAKOT3GXjuLprj6c="; }; - # https://github.com/citusdata/postgresql-hll/issues/166#issuecomment-3165489050 - NIX_CFLAGS_COMPILE = "-Wno-error=missing-variable-declarations"; + patches = [ + (fetchpatch { + name = "fix-postgresql-18.patch"; + url = "https://github.com/citusdata/postgresql-hll/commit/f998e234653ea397ddddc1278d1c02d8d011bd16.patch"; + hash = "sha256-gF4f+B4Gu/QEyCGMfKLmRK6lNwgfd8lML55wMkhsSY4="; + }) + ]; meta = { description = "HyperLogLog for PostgreSQL"; From 01dde1fe6be0ba297dfacdf1fd625f074deee976 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 4 Sep 2025 10:57:45 +0200 Subject: [PATCH 3/3] postgresqlPackages: remove outdated broken conditions "older than v13" is not important anymore, we don't package v12. --- pkgs/servers/sql/postgresql/ext/pg_ivm.nix | 15 ++++++--------- pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix | 1 - 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_ivm.nix b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix index 1c57b2502482..4fcb9c38dc4b 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_ivm.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix @@ -23,14 +23,11 @@ postgresqlBuildExtension (finalAttrs: { maintainers = with lib.maintainers; [ ivan ]; platforms = postgresql.meta.platforms; license = lib.licenses.postgresql; - broken = - lib.versionOlder postgresql.version "13" - || - # PostgreSQL 18 support issue upstream: https://github.com/sraoss/pg_ivm/issues/133 - # Note: already fixed on `main` branch. - # Check after next package update. - lib.warnIf (finalAttrs.version != "1.11") "Is postgresql18Packages.pg_ivm still broken?" ( - lib.versionAtLeast postgresql.version "18" - ); + # PostgreSQL 18 support issue upstream: https://github.com/sraoss/pg_ivm/issues/133 + # Note: already fixed on `main` branch. + # Check after next package update. + broken = lib.warnIf (finalAttrs.version != "1.11") "Is postgresql18Packages.pg_ivm still broken?" ( + lib.versionAtLeast postgresql.version "18" + ); }; }) diff --git a/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix b/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix index e648a5a65750..3eef7dbefa06 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix @@ -23,6 +23,5 @@ postgresqlBuildExtension (finalAttrs: { maintainers = with lib.maintainers; [ gaelreyrol ]; platforms = postgresql.meta.platforms; license = lib.licenses.mpl20; - broken = lib.versionOlder postgresql.version "13"; }; })