From eeec06e84fe2a76e7ec1650a0322ea840988ab09 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Wed, 19 Mar 2025 14:10:35 +0100 Subject: [PATCH] haskellPackages.postgres-websockets: unbreak --- .../haskell-modules/configuration-common.nix | 11 +++++++++++ .../configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index babf456d5712..6ed2a1874d01 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2479,6 +2479,17 @@ self: super: { # unbreak with tasty-quickcheck 0.11, can be dropped for Stackage LTS >= 23.9 text-builder = doDistribute self.text-builder_0_6_7_3; + postgres-websockets = lib.pipe super.postgres-websockets [ + (addTestToolDepends [ pkgs.postgresql pkgs.postgresqlTestHook ]) + (dontCheckIf pkgs.postgresqlTestHook.meta.broken) + (overrideCabal { + preCheck = '' + export postgresqlEnableTCP=1 + export PGDATABASE=postgres_ws_test + ''; + }) + ]; + postgrest = lib.pipe (super.postgrest.overrideScope (self: super: { # 2025-01-19: Upstream is stuck at hasql < 1.7 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index b5565e0f9823..e17ed3711182 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -4496,7 +4496,6 @@ broken-packages: - postgresql-typed-lifted # failure in job https://hydra.nixos.org/build/233215141 at 2023-09-02 - postgres-tmp # failure in job https://hydra.nixos.org/build/233258685 at 2023-09-02 - postgrest-ws # failure in job https://hydra.nixos.org/build/233247807 at 2023-09-02 - - postgres-websockets # failure in job https://hydra.nixos.org/build/233199923 at 2023-09-02 - postie # failure in job https://hydra.nixos.org/build/233259075 at 2023-09-02 - postmark-streams # failure in job https://hydra.nixos.org/build/233233210 at 2023-09-02 - postmaster # failure in job https://hydra.nixos.org/build/233258599 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d94ec23b53f2..a53447c28042 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -248091,9 +248091,7 @@ self: { ]; description = "Middleware to map LISTEN/NOTIFY messages to Websockets"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "postgres-websockets"; - broken = true; }) {}; "postgresql-binary_0_13_1_3" = callPackage