1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 19:21:04 +00:00

Merge: [24.05] postgresql_16: 16.4 -> 16.5, revert postgresql_15 upgrade (and retarget to staging) (#356464)

This commit is contained in:
Maximilian Bosch 2024-11-16 14:44:18 +01:00 committed by GitHub
commit bdcce06f4b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 5 deletions

View file

@ -1,4 +1,4 @@
import ./generic.nix {
version = "15.9";
hash = "sha256-dPLUVlA18M9ynssFmUn6rxECy9k3WbNZgi+Y+CGYx4M=";
version = "15.8";
hash = "sha256-RANRX5pp7rPv68mPMLjGlhIr/fiV6Ss7I/W452nty2o=";
}

View file

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

View file

@ -119,7 +119,7 @@ let
src = ./patches/locale-binary-path.patch;
locale = "${if stdenv.isDarwin then darwin.adv_cmds else lib.getBin stdenv.cc.libc}/bin/locale";
})
] ++ lib.optionals (atLeast "16") [
] ++ lib.optionals (atLeast "15" && olderThan "16") [
# TODO: Remove this with the next set of minor releases
(fetchpatch ({
url = "https://github.com/postgres/postgres/commit/b27622c90869aab63cfe22159a459c57768b0fa4.patch";