From 07885bcfa1021fc2e7e4cac4812c27d5be9e2eb9 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 11 Nov 2025 12:50:19 +0100
Subject: [PATCH] postgresql_18: 18.0 -> 18.1

Release Notes:
https://github.com/postgres/postgres/blob/4b324845ba5d24682b9b3708a769f00d160afbd7/doc/src/sgml/release-18.sgml

Fixes:
CVE-2025-12817
CVE-2025-12818
---
 pkgs/servers/sql/postgresql/18.nix      | 8 +++++---
 pkgs/servers/sql/postgresql/generic.nix | 6 ------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/18.nix b/pkgs/servers/sql/postgresql/18.nix
index 401471cde9a7..ab7a401d8b98 100644
--- a/pkgs/servers/sql/postgresql/18.nix
+++ b/pkgs/servers/sql/postgresql/18.nix
@@ -1,7 +1,9 @@
 import ./generic.nix {
-  version = "18.0";
-  rev = "refs/tags/REL_18_0";
-  hash = "sha256-xA6gbJe4tIV9bYRFrdI4Rfy20ZwTkvyyjt7ZxvCFEec=";
+  version = "18.1";
+  # TODO: Move back to tag, when they appear upstream:
+  # rev = "refs/tags/REL_18_1";
+  rev = "4b324845ba5d24682b9b3708a769f00d160afbd7";
+  hash = "sha256-cZA2hWtr5RwsUrRWkvl/yvUzFPSfdtpyAKGXfrVUr0g=";
   muslPatches = {
     dont-use-locale-a = {
       url = "https://git.alpinelinux.org/aports/plain/main/postgresql17/dont-use-locale-a-on-musl.patch?id=d69ead2c87230118ae7f72cef7d761e761e1f37e";
diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index 1ab79b168039..5cc4f21ea8db 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -426,12 +426,6 @@ let
       ]
       ++ lib.optionals (stdenv'.hostPlatform.isDarwin && olderThan "16") [
         ./patches/export-dynamic-darwin-15-.patch
-      ]
-      ++ lib.optionals (atLeast "18") [
-        (fetchpatch2 {
-          url = "https://github.com/postgres/postgres/commit/a48d1ef58652229521ba4b5070e19f857608b22e.patch";
-          hash = "sha256-3FKQS1Vpu+p6z6c1GWs6GlrLl2Bgm9paEU/z81LrEus=";
-        })
       ];
 
       installTargets = [ "install-world" ];