mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-29 02:13:23 +00:00
postgresql_13: 13.16 -> 13.17
Release Notes:
https://www.postgresql.org/about/news/postgresql-171-165-159-1414-1317-and-1221-released-2955/
(cherry picked from commit b1a05d9399
)
This commit is contained in:
parent
f19edf78d4
commit
e18ad10054
@ -1,6 +1,6 @@
|
|||||||
import ./generic.nix {
|
import ./generic.nix {
|
||||||
version = "13.16";
|
version = "13.17";
|
||||||
hash = "sha256-ycu7YSnwIyggSCgGa7N4XACoXIyo/TKcKopTwfXNiGU=";
|
hash = "sha256-AisKbnvDdKd37s4zcIiV17YMrgfUkrKGspaknXOV14s=";
|
||||||
muslPatches = {
|
muslPatches = {
|
||||||
disable-test-collate-icu-utf8 = {
|
disable-test-collate-icu-utf8 = {
|
||||||
url = "https://git.alpinelinux.org/aports/plain/main/postgresql13/disable-test-collate.icu.utf8.patch?id=69faa146ec9fff3b981511068f17f9e629d4688b";
|
url = "https://git.alpinelinux.org/aports/plain/main/postgresql13/disable-test-collate.icu.utf8.patch?id=69faa146ec9fff3b981511068f17f9e629d4688b";
|
||||||
|
@ -119,23 +119,13 @@ let
|
|||||||
src = ./patches/locale-binary-path.patch;
|
src = ./patches/locale-binary-path.patch;
|
||||||
locale = "${if stdenv.isDarwin then darwin.adv_cmds else lib.getBin stdenv.cc.libc}/bin/locale";
|
locale = "${if stdenv.isDarwin then darwin.adv_cmds else lib.getBin stdenv.cc.libc}/bin/locale";
|
||||||
})
|
})
|
||||||
|
] ++ lib.optionals (atLeast "14") [
|
||||||
# TODO: Remove this with the next set of minor releases
|
# TODO: Remove this with the next set of minor releases
|
||||||
(fetchpatch (
|
(fetchpatch ({
|
||||||
if atLeast "14" then {
|
|
||||||
url = "https://github.com/postgres/postgres/commit/b27622c90869aab63cfe22159a459c57768b0fa4.patch";
|
url = "https://github.com/postgres/postgres/commit/b27622c90869aab63cfe22159a459c57768b0fa4.patch";
|
||||||
hash = "sha256-7G+BkJULhyx6nlMEjClcr2PJg6awgymZHr2JgGhXanA=";
|
hash = "sha256-7G+BkJULhyx6nlMEjClcr2PJg6awgymZHr2JgGhXanA=";
|
||||||
excludes = [ "doc/*" ];
|
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 (
|
] ++ lib.optionals stdenv'.hostPlatform.isMusl (
|
||||||
# Using fetchurl instead of fetchpatch on purpose: https://github.com/NixOS/nixpkgs/issues/240141
|
# Using fetchurl instead of fetchpatch on purpose: https://github.com/NixOS/nixpkgs/issues/240141
|
||||||
map fetchurl (lib.attrValues muslPatches)
|
map fetchurl (lib.attrValues muslPatches)
|
||||||
|
Loading…
Reference in New Issue
Block a user