From 9f20e3789b504d7999bbb346f5efa164a5c04b61 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 24 Sep 2025 09:13:35 +0200
Subject: [PATCH 1/2] postgresql_18: 18rc1 -> 18.0

---
 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 46211a7b5fae..401471cde9a7 100644
--- a/pkgs/servers/sql/postgresql/18.nix
+++ b/pkgs/servers/sql/postgresql/18.nix
@@ -1,7 +1,7 @@
 import ./generic.nix {
-  version = "18rc1";
-  rev = "refs/tags/REL_18_RC1";
-  hash = "sha256-PDycGuKrEa00N1h/BsWUiwG7naE0f2wFFXpQSOhs/hY=";
+  version = "18.0";
+  rev = "refs/tags/REL_18_0";
+  hash = "sha256-xA6gbJe4tIV9bYRFrdI4Rfy20ZwTkvyyjt7ZxvCFEec=";
   muslPatches = {
     dont-use-locale-a = {
       url = "https://git.alpinelinux.org/aports/plain/main/postgresql17/dont-use-locale-a-on-musl.patch?id=d69ead2c87230118ae7f72cef7d761e761e1f37e";

From f797efcfe812b6757b18ee45894377354b4b9b60 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 24 Sep 2025 14:32:57 +0200
Subject: [PATCH 2/2] nixosTests.postgresql.anonymizer.postgresql_18: fix test

The test for the latest PostgreSQL version will always fail while
`postgresql` doesn't point to that, yet.

That's because `pg_dump` can only connect to older versions, so the
`postgresql` package that `pg-dump-anon` uses always needs to use the
very latest version.
---
 nixos/tests/postgresql/anonymizer.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/postgresql/anonymizer.nix b/nixos/tests/postgresql/anonymizer.nix
index 2da7ed506111..689bfb378b8f 100644
--- a/nixos/tests/postgresql/anonymizer.nix
+++ b/nixos/tests/postgresql/anonymizer.nix
@@ -16,7 +16,7 @@ let
       nodes.machine =
         { pkgs, ... }:
         {
-          environment.systemPackages = [ pkgs.pg-dump-anon ];
+          environment.systemPackages = [ (pkgs.pg-dump-anon.override { postgresql = package; }) ];
           services.postgresql = {
             inherit package;
             enable = true;