From cf1f7e720107fee55bf56fa7ea1c14727b0db9ac Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 14 Nov 2024 19:23:47 +0100 Subject: [PATCH] postgresql_14: 14.13 -> 14.14 Release Notes: https://www.postgresql.org/about/news/postgresql-171-165-159-1414-1317-and-1221-released-2955/ --- pkgs/servers/sql/postgresql/14.nix | 4 ++-- pkgs/servers/sql/postgresql/generic.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/14.nix b/pkgs/servers/sql/postgresql/14.nix index ed6661a474ac..02292b9a18fb 100644 --- a/pkgs/servers/sql/postgresql/14.nix +++ b/pkgs/servers/sql/postgresql/14.nix @@ -1,6 +1,6 @@ import ./generic.nix { - version = "14.13"; - hash = "sha256-Wao8S0lasmqexp860KAijFHw/m+s82NN+tTRGX1hOlY="; + version = "14.14"; + hash = "sha256-hHJ/vM29Hv4B2N5kvBszCV23c60kV8787cLYJY68CdY="; muslPatches = { disable-test-collate-icu-utf8 = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/disable-test-collate.icu.utf8.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7"; diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index b7564d1d7221..5f1c41f26281 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -171,7 +171,7 @@ let url = "https://github.com/postgres/postgres/commit/0a883a067bd78f0ff0607afb18c4f783ac764504.patch"; hash = "sha256-F3zCaar6w6bwQDno7Tkg7ZbPJ+rhgi8/2NSvFakzQek="; })) - ] ++ lib.optionals (olderThan "17" && atLeast "14") [ + ] ++ lib.optionals (olderThan "17" && atLeast "15") [ # TODO: Remove this with the next set of minor releases (fetchpatch ({ url = "https://github.com/postgres/postgres/commit/b27622c90869aab63cfe22159a459c57768b0fa4.patch";