From 8af07b25acc7a5be61fc3c09551f1b1518ef11e2 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 13 Nov 2025 12:17:52 +0100
Subject: [PATCH] postgresql: switch back to latest tags

The commits we already switched to have now been tagged, so we can go
back to these.
---
 pkgs/servers/sql/postgresql/13.nix    | 4 +---
 pkgs/servers/sql/postgresql/14.nix    | 4 +---
 pkgs/servers/sql/postgresql/15.nix    | 4 +---
 pkgs/servers/sql/postgresql/16.nix    | 4 +---
 pkgs/servers/sql/postgresql/17.nix    | 4 +---
 pkgs/servers/sql/postgresql/18.nix    | 4 +---
 pkgs/servers/sql/postgresql/libpq.nix | 4 +---
 7 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/13.nix b/pkgs/servers/sql/postgresql/13.nix
index 7be01f723e00..8f2892d4ee08 100644
--- a/pkgs/servers/sql/postgresql/13.nix
+++ b/pkgs/servers/sql/postgresql/13.nix
@@ -1,8 +1,6 @@
 import ./generic.nix {
   version = "13.23";
-  # TODO: Move back to tag, when they appear upstream:
-  # rev = "refs/tags/REL_13_23";
-  rev = "89df812eb890814b105d871185935b580478e660";
+  rev = "refs/tags/REL_13_23";
   hash = "sha256-GSIHFSt2wzaI3HkA3yX/gZZF+LKwODHYislagdhQjmE=";
   muslPatches = {
     disable-test-collate-icu-utf8 = {
diff --git a/pkgs/servers/sql/postgresql/14.nix b/pkgs/servers/sql/postgresql/14.nix
index 09262f8be453..4806945ce991 100644
--- a/pkgs/servers/sql/postgresql/14.nix
+++ b/pkgs/servers/sql/postgresql/14.nix
@@ -1,8 +1,6 @@
 import ./generic.nix {
   version = "14.20";
-  # TODO: Move back to tag, when they appear upstream:
-  # rev = "refs/tags/REL_14_20";
-  rev = "9ad034be354da9af1cea76836a9e576c110d1ff3";
+  rev = "refs/tags/REL_14_20";
   hash = "sha256-5wWuS78yn1p+ZjlUy5jCf1mLq78D3iI7mWPBVTd1Ufk=";
   muslPatches = {
     disable-test-collate-icu-utf8 = {
diff --git a/pkgs/servers/sql/postgresql/15.nix b/pkgs/servers/sql/postgresql/15.nix
index 11e4144564e8..dbb08beba782 100644
--- a/pkgs/servers/sql/postgresql/15.nix
+++ b/pkgs/servers/sql/postgresql/15.nix
@@ -1,8 +1,6 @@
 import ./generic.nix {
   version = "15.15";
-  # TODO: Move back to tag, when they appear upstream:
-  # rev = "refs/tags/REL_15_15";
-  rev = "32f38816779420502d4a311835d5fe939e9548a0";
+  rev = "refs/tags/REL_15_15";
   hash = "sha256-veGKXAvK+dNofBuSXsmCsPdXDJOC04+QV3HEr0XaE68=";
   muslPatches = {
     dont-use-locale-a = {
diff --git a/pkgs/servers/sql/postgresql/16.nix b/pkgs/servers/sql/postgresql/16.nix
index 478c1dc234bd..3e5b13a007eb 100644
--- a/pkgs/servers/sql/postgresql/16.nix
+++ b/pkgs/servers/sql/postgresql/16.nix
@@ -1,8 +1,6 @@
 import ./generic.nix {
   version = "16.11";
-  # TODO: Move back to tag, when they appear upstream:
-  # rev = "refs/tags/REL_16_11";
-  rev = "d61dd817be70749d14e982a369e97fdda9d5cba6";
+  rev = "refs/tags/REL_16_11";
   hash = "sha256-hxv+N+OWqiXmFmsB+SSYGKQLBbHtNMnneHFvOtUz8z4=";
   muslPatches = {
     dont-use-locale-a = {
diff --git a/pkgs/servers/sql/postgresql/17.nix b/pkgs/servers/sql/postgresql/17.nix
index 3f6e2b3f5b22..4ec01810d5bd 100644
--- a/pkgs/servers/sql/postgresql/17.nix
+++ b/pkgs/servers/sql/postgresql/17.nix
@@ -1,8 +1,6 @@
 import ./generic.nix {
   version = "17.7";
-  # TODO: Move back to tag, when they appear upstream:
-  # rev = "refs/tags/REL_17_7";
-  rev = "fbb530a3dff569222bea7098ad4de3d8bde97740";
+  rev = "refs/tags/REL_17_7";
   hash = "sha256-W+505LAeiO5ln7wBhxZLv/p3GxiJp8MFfCGVDyvHREg=";
   muslPatches = {
     dont-use-locale-a = {
diff --git a/pkgs/servers/sql/postgresql/18.nix b/pkgs/servers/sql/postgresql/18.nix
index ab7a401d8b98..f2680efa9249 100644
--- a/pkgs/servers/sql/postgresql/18.nix
+++ b/pkgs/servers/sql/postgresql/18.nix
@@ -1,8 +1,6 @@
 import ./generic.nix {
   version = "18.1";
-  # TODO: Move back to tag, when they appear upstream:
-  # rev = "refs/tags/REL_18_1";
-  rev = "4b324845ba5d24682b9b3708a769f00d160afbd7";
+  rev = "refs/tags/REL_18_1";
   hash = "sha256-cZA2hWtr5RwsUrRWkvl/yvUzFPSfdtpyAKGXfrVUr0g=";
   muslPatches = {
     dont-use-locale-a = {
diff --git a/pkgs/servers/sql/postgresql/libpq.nix b/pkgs/servers/sql/postgresql/libpq.nix
index 32878f3660ab..0faf9f4f6ed5 100644
--- a/pkgs/servers/sql/postgresql/libpq.nix
+++ b/pkgs/servers/sql/postgresql/libpq.nix
@@ -46,9 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "postgres";
     repo = "postgres";
     # rev, not tag, on purpose: see generic.nix.
-    # TODO: Move back to tag, when they appear upstream:
-    # rev = "refs/tags/REL_18_1";
-    rev = "4b324845ba5d24682b9b3708a769f00d160afbd7";
+    rev = "refs/tags/REL_18_1";
     hash = "sha256-cZA2hWtr5RwsUrRWkvl/yvUzFPSfdtpyAKGXfrVUr0g=";
   };