Unverified Commit 52bb840e authored by Wolfgang Walther's avatar Wolfgang Walther
Browse files

postgresql: fix regress tests after tzdata update 

This was discussed upstream here:
https://postgr.es/m/0a997455-5aba-4cf2-a354-d26d8bcbfae6%40technowledgy.de

This will be in the next minor releases, until then apply the patch.
parent 76f4ef68

pkgs/servers/sql/postgresql/generic.nix

+17 −0
Original line number Diff line number Diff line
@@ -161,6 +161,23 @@ let 
        src = ./patches/locale-binary-path.patch;

        locale = "${if stdenv.isDarwin then darwin.adv_cmds else lib.getBin stdenv.cc.libc}/bin/locale";

      })



      # TODO: Remove this with the next set of minor releases

      (fetchpatch (

        if atLeast "14" then {

          url = "https://github.com/postgres/postgres/commit/b27622c90869aab63cfe22159a459c57768b0fa4.patch";

          hash = "sha256-7G+BkJULhyx6nlMEjClcr2PJg6awgymZHr2JgGhXanA=";

          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 (

      # Using fetchurl instead of fetchpatch on purpose: https://github.com/NixOS/nixpkgs/issues/240141

      map fetchurl (lib.attrValues muslPatches)