nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-02 04:50:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reapply "postgresql_15: 15.8 -> 15.9"

Browse Source 
This reverts commit e13094a6f5.
This commit is contained in:
Maximilian Bosch
2024-11-16 14:34:47 +01:00
parent 218400f000
commit ba7ccafdbc
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -119,13 +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";
})
] ++ 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";
hash = "sha256-7G+BkJULhyx6nlMEjClcr2PJg6awgymZHr2JgGhXanA=";
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)