Merge: postgresql_17: fix build (NixOS#354571)

leo248 · Nov 9, 2024 · 8091ea3 · 8091ea3
2 parents 3b91a81 + 676db52
commit 8091ea3
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
@@ -189,6 +189,12 @@ 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/[email protected]
+      (fetchpatch {
+        url = "https://github.com/postgres/postgres/commit/a358019159de68d4f045cbb5d89c8c8c2e96e483.patch";
+        hash = "sha256-9joQZo93oUTp6CrcGnhj7o+Mrbj/KCWwwGUc9KAst+s=";
+      })
     ];
 
     installTargets = [ "install-world" ];