From fbae27508f9b179f05fc88bae1f68b5c50acbb12 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 14 Nov 2024 19:10:04 +0100 Subject: [PATCH 1/5] postgresql_12: 12.20 -> 12.21 Release Notes: https://www.postgresql.org/about/news/postgresql-171-165-159-1414-1317-and-1221-released-2955/ --- pkgs/servers/sql/postgresql/12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/12.nix b/pkgs/servers/sql/postgresql/12.nix index 72e3c88301df..3b40e5cca47e 100644 --- a/pkgs/servers/sql/postgresql/12.nix +++ b/pkgs/servers/sql/postgresql/12.nix @@ -1,6 +1,6 @@ import ./generic.nix { - version = "12.20"; - hash = "sha256-LVQ68wCf7H/VrzX3pwyVCF0+72tQjlF6qUk+mbFenqk="; + version = "12.21"; + hash = "sha256-bHEVUKwcx4KIZeWCPZ9Ffjva1vQyAXcWn5DkGb4MJ/I="; muslPatches = { dont-use-locale-a = { url = "https://git.alpinelinux.org/aports/plain/testing/postgresql12/dont-use-locale-a-on-musl.patch?id=d5227c91adda59d4e7f55f13468f0314e8869174"; From b1a05d9399c3a0fea9c108ca2569d5c37a868c0c Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 14 Nov 2024 19:20:16 +0100 Subject: [PATCH 2/5] postgresql_13: 13.16 -> 13.17 Release Notes: https://www.postgresql.org/about/news/postgresql-171-165-159-1414-1317-and-1221-released-2955/ --- pkgs/servers/sql/postgresql/13.nix | 4 ++-- pkgs/servers/sql/postgresql/generic.nix | 16 +++------------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/pkgs/servers/sql/postgresql/13.nix b/pkgs/servers/sql/postgresql/13.nix index 1f4483ccc631..56db6b090804 100644 --- a/pkgs/servers/sql/postgresql/13.nix +++ b/pkgs/servers/sql/postgresql/13.nix @@ -1,6 +1,6 @@ import ./generic.nix { - version = "13.16"; - hash = "sha256-ycu7YSnwIyggSCgGa7N4XACoXIyo/TKcKopTwfXNiGU="; + version = "13.17"; + hash = "sha256-AisKbnvDdKd37s4zcIiV17YMrgfUkrKGspaknXOV14s="; muslPatches = { disable-test-collate-icu-utf8 = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql13/disable-test-collate.icu.utf8.patch?id=69faa146ec9fff3b981511068f17f9e629d4688b"; diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 2562105b2411..b7564d1d7221 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -171,23 +171,13 @@ let url = "https://github.com/postgres/postgres/commit/0a883a067bd78f0ff0607afb18c4f783ac764504.patch"; hash = "sha256-F3zCaar6w6bwQDno7Tkg7ZbPJ+rhgi8/2NSvFakzQek="; })) - ] ++ lib.optionals (olderThan "17") [ + ] ++ lib.optionals (olderThan "17" && atLeast "14") [ # TODO: Remove this with the next set of minor releases - (fetchpatch ( - if atLeast "14" then { + (fetchpatch ({ url = "https://github.com/postgres/postgres/commit/b27622c90869aab63cfe22159a459c57768b0fa4.patch"; hash = "sha256-7G+BkJULhyx6nlMEjClcr2PJg6awgymZHr2JgGhXanA="; excludes = [ "doc/*" ]; - } else if atLeast "13" then { - url = "https://github.com/postgres/postgres/commit/b28b9b19bbe3410da4a805ef775e0383a66af314.patch"; - hash = "sha256-meFFskNWlcc/rv4BWo6fNR/tTFgQRgXGqTkJkoX7lHU="; - excludes = [ "doc/*" ]; - } else { - url = "https://github.com/postgres/postgres/commit/205813da4c264d80db3c3215db199cc119e18369.patch"; - hash = "sha256-L8/ns/fxTh2ayfDQXtBIKaArFhMd+v86UxVFWQdmzUw="; - excludes = [ "doc/*" ]; - }) - ) + })) ] ++ lib.optionals stdenv'.hostPlatform.isMusl ( # Using fetchurl instead of fetchpatch on purpose: https://github.com/NixOS/nixpkgs/issues/240141 map fetchurl (lib.attrValues muslPatches) From cf1f7e720107fee55bf56fa7ea1c14727b0db9ac Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 14 Nov 2024 19:23:47 +0100 Subject: [PATCH 3/5] 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"; From 9dc6733018133e469254ad4f76e76f4360bf56f1 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 14 Nov 2024 19:26:41 +0100 Subject: [PATCH 4/5] postgresql_15: 15.8 -> 15.9 Release Notes: https://www.postgresql.org/about/news/postgresql-171-165-159-1414-1317-and-1221-released-2955/ --- pkgs/servers/sql/postgresql/15.nix | 4 ++-- pkgs/servers/sql/postgresql/generic.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/15.nix b/pkgs/servers/sql/postgresql/15.nix index 5ede047dc2b0..85a128fbfb13 100644 --- a/pkgs/servers/sql/postgresql/15.nix +++ b/pkgs/servers/sql/postgresql/15.nix @@ -1,6 +1,6 @@ import ./generic.nix { - version = "15.8"; - hash = "sha256-RANRX5pp7rPv68mPMLjGlhIr/fiV6Ss7I/W452nty2o="; + version = "15.9"; + hash = "sha256-dPLUVlA18M9ynssFmUn6rxECy9k3WbNZgi+Y+CGYx4M="; muslPatches = { dont-use-locale-a = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql15/dont-use-locale-a-on-musl.patch?id=f424e934e6d076c4ae065ce45e734aa283eecb9c"; diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 5f1c41f26281..6f53fa9031e0 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 "15") [ + ] ++ lib.optionals (olderThan "17" && atLeast "16") [ # TODO: Remove this with the next set of minor releases (fetchpatch ({ url = "https://github.com/postgres/postgres/commit/b27622c90869aab63cfe22159a459c57768b0fa4.patch"; From 8e48064d55aacea8ce03b1c9e705c700d783f5d4 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 14 Nov 2024 19:31:37 +0100 Subject: [PATCH 5/5] postgresql_17: 17.0 -> 17.1 Release Notes: https://www.postgresql.org/about/news/postgresql-171-165-159-1414-1317-and-1221-released-2955/ --- pkgs/servers/sql/postgresql/17.nix | 12 ++++++++---- pkgs/servers/sql/postgresql/generic.nix | 12 ------------ 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/pkgs/servers/sql/postgresql/17.nix b/pkgs/servers/sql/postgresql/17.nix index 5d8d8cd693c2..07335b44570b 100644 --- a/pkgs/servers/sql/postgresql/17.nix +++ b/pkgs/servers/sql/postgresql/17.nix @@ -1,6 +1,10 @@ import ./generic.nix { - version = "17.0"; - hash = "sha256-fidhMcD91rYliNutmzuyS4w0mNUAkyjbpZrxboGRCd4="; - # TODO: Add dont-use-locale-a-on-musl.patch once Alpine Linux has PostgreSQL 17. - # MR in: https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/72853 + version = "17.1"; + hash = "sha256-eEnbdO9qhVXQcj+H6BU5MBQi+pyOnyHM5h/cFOkZnc0="; + muslPatches = { + dont-use-locale-a = { + url = "https://git.alpinelinux.org/aports/plain/main/postgresql17/dont-use-locale-a-on-musl.patch?id=d69ead2c87230118ae7f72cef7d761e761e1f37e"; + hash = "sha256-6zjz3OpMx4qTETdezwZxSJPPdOvhCNu9nXvAaU9SwH8="; + }; + }; } diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 6f53fa9031e0..546dbf1e284c 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -165,12 +165,6 @@ let src = ./patches/locale-binary-path.patch; locale = "${if stdenv.hostPlatform.isDarwin then darwin.adv_cmds else lib.getBin stdenv.cc.libc}/bin/locale"; }) - ] ++ lib.optionals (stdenv'.hostPlatform.isDarwin && atLeast "17") [ - # TODO: Remove this with the next set of minor releases - (fetchpatch ({ - url = "https://github.com/postgres/postgres/commit/0a883a067bd78f0ff0607afb18c4f783ac764504.patch"; - hash = "sha256-F3zCaar6w6bwQDno7Tkg7ZbPJ+rhgi8/2NSvFakzQek="; - })) ] ++ lib.optionals (olderThan "17" && atLeast "16") [ # TODO: Remove this with the next set of minor releases (fetchpatch ({ @@ -185,12 +179,6 @@ let (if atLeast "13" then ./patches/socketdir-in-run-13+.patch else ./patches/socketdir-in-run.patch) ] ++ lib.optionals (stdenv'.hostPlatform.isDarwin && olderThan "16") [ ./patches/export-dynamic-darwin-15-.patch - ] ++ lib.optionals (atLeast "17") [ - # Fix flaky test, https://www.postgresql.org/message-id/ba8e1bc0-8a99-45b7-8397-3f2e94415e03@suse.de - (fetchpatch { - url = "https://github.com/postgres/postgres/commit/a358019159de68d4f045cbb5d89c8c8c2e96e483.patch"; - hash = "sha256-9joQZo93oUTp6CrcGnhj7o+Mrbj/KCWwwGUc9KAst+s="; - }) ]; installTargets = [ "install-world" ];