nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 15:03:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #333461: postgres: security+bugfix updates

Browse Source 
...into staging-next

https://www.postgresql.org/about/news/postgresql-164-158-1413-1316-1220-and-17-beta-3-released-2910/
This commit is contained in:
Vladimír Čunát 2024-08-10 07:26:13 +02:00
commit b99f751acd
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
6 changed files with 11 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/servers/sql/postgresql/12.nix
View File

@ -1,4 +1,4 @@
import ./generic.nix {
version = "12.19";
hash = "sha256-YX495Swi6CL09X0B1bIkBQPhmKnsyvWYqFEQm9GOb7s=";
version = "12.20";
hash = "sha256-LVQ68wCf7H/VrzX3pwyVCF0+72tQjlF6qUk+mbFenqk=";
}

4
pkgs/servers/sql/postgresql/13.nix
View File

@ -1,6 +1,6 @@
import ./generic.nix {
version = "13.15";
hash = "sha256-Qu3UFURtM7jCQr520a0FdTGyJksuhpOTObcHXG5OySU=";
version = "13.16";
hash = "sha256-ycu7YSnwIyggSCgGa7N4XACoXIyo/TKcKopTwfXNiGU=";
muslPatches = {
disable-test-collate-icu-utf8 = {
url = "https://git.alpinelinux.org/aports/plain/main/postgresql13/disable-test-collate.icu.utf8.patch?id=69faa146ec9fff3b981511068f17f9e629d4688b";

4
pkgs/servers/sql/postgresql/14.nix
View File

@ -1,6 +1,6 @@
import ./generic.nix {
version = "14.12";
hash = "sha256-YRjQj53cwb2Dzyt8x007WDvc7C835iRaisADuPqoCSM=";
version = "14.13";
hash = "sha256-Wao8S0lasmqexp860KAijFHw/m+s82NN+tTRGX1hOlY=";
muslPatches = {
disable-test-collate-icu-utf8 = {
url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/disable-test-collate.icu.utf8.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7";

4
pkgs/servers/sql/postgresql/15.nix
View File

@ -1,4 +1,4 @@
import ./generic.nix {
version = "15.7";
hash = "sha256-pG/klIWrY4Xjnau7tlT10wSSBvds1pXiJCaHKVIJmPc=";
version = "15.8";
hash = "sha256-RANRX5pp7rPv68mPMLjGlhIr/fiV6Ss7I/W452nty2o=";
}

4
pkgs/servers/sql/postgresql/16.nix
View File

@ -1,4 +1,4 @@
import ./generic.nix {
version = "16.3";
hash = "sha256-Mxlj1dPcTK9CFqBJ+kC2bWvLjHMGFYWUEblRh2TmBYU=";
version = "16.4";
hash = "sha256-lxdm1kWqc+k7nvTjvkQgG09FtUdwlbBJElQD+fM4bW8=";
}

19
pkgs/servers/sql/postgresql/generic.nix
View File

@ -19,7 +19,7 @@ let
, version, hash, muslPatches ? {}
# for tests
, testers, nixosTests
, testers
# JIT
, jitSupport
@ -119,23 +119,6 @@ let
src = ./patches/locale-binary-path.patch;
locale = "${if stdenv.isDarwin then darwin.adv_cmds else lib.getBin stdenv.cc.libc}/bin/locale";
})
(
if atLeast "16" then
fetchpatch {
name = "libxml2-2.13-compat.patch";
# This one is for 16 branch upstream.
url = "https://github.com/postgres/postgres/commit/f85c91a1867b45742bb28e4578ca2b4a0976383f.diff";
hash = "sha256-4YcXfo98uVuCu+ybVw3bM4x8Y0I1xfjdjBZOlhyF21w=";
}
else
fetchpatch {
name = "libxml2-2.13-compat.patch";
# This one is for 15 branch upstream, but it also applies well to all our older branches.
url = "https://github.com/postgres/postgres/commit/f68d6aabb7e2c803818185b49a3d356bdb2b2974.diff";
hash = "sha256-Nelb0mbjx0Xq9UJuVv7cs3ifCtUPP7UZraPMPGb2wyQ=";
}
)
] ++ lib.optionals stdenv'.hostPlatform.isMusl (
# Using fetchurl instead of fetchpatch on purpose: https://github.com/NixOS/nixpkgs/issues/240141
map fetchurl (lib.attrValues muslPatches)