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

postgresql_17: 17.0 -> 17.1

Browse Source 
Release Notes:
https://www.postgresql.org/about/news/postgresql-171-165-159-1414-1317-and-1221-released-2955/

(cherry picked from commit 8e48064d55)
This commit is contained in:
Wolfgang Walther 2024-11-14 19:31:37 +01:00 committed by github-actions[bot]
parent 40d87ba1a1
commit 38d6432684
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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=";
};
};
}

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

@ -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" ];