From f9cbdbceb5bd16a5edc643ff440fccf3ade36a57 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 26 Sep 2025 13:07:29 +0200 Subject: [PATCH] haskellPackages: only use postgresqlTestHook if available --- .../haskell-modules/configuration-nix.nix | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 6e3c0f042565..dc5a276ecd6d 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1218,6 +1218,7 @@ builtins.intersectAttrs super { pkgs.postgresql pkgs.postgresqlTestHook ]; + doCheck = drv.doCheck or true && !(pkgs.postgresqlTestHook.meta.broken); }) super.relocant; # https://gitlab.iscpif.fr/gargantext/haskell-pgmq/blob/9a869df2842eccc86a0f31a69fb8dc5e5ca218a8/README.md#running-test-cases @@ -1230,6 +1231,7 @@ builtins.intersectAttrs super { (lib.getBin (pkgs.postgresql.withPackages (ps: [ ps.pgmq ]))) pkgs.postgresqlTestHook ]; + doCheck = drv.doCheck or true && !(pkgs.postgresqlTestHook.meta.broken); }) super.haskell-pgmq; migrant-postgresql-simple = lib.pipe super.migrant-postgresql-simple [ @@ -1242,6 +1244,7 @@ builtins.intersectAttrs super { pkgs.postgresql pkgs.postgresqlTestHook ]) + (dontCheckIf pkgs.postgresqlTestHook.meta.broken) ]; postgresql-simple-migration = overrideCabal (drv: { @@ -1254,12 +1257,16 @@ builtins.intersectAttrs super { pkgs.postgresqlTestHook ]; jailbreak = true; + doCheck = drv.doCheck or true && !(pkgs.postgresqlTestHook.meta.broken); }) super.postgresql-simple-migration; - postgresql-simple = addTestToolDepends [ - pkgs.postgresql - pkgs.postgresqlTestHook - ] super.postgresql-simple; + postgresql-simple = lib.pipe super.postgresql-simple [ + (addTestToolDepends [ + pkgs.postgresql + pkgs.postgresqlTestHook + ]) + (dontCheckIf pkgs.postgresqlTestHook.meta.broken) + ]; beam-postgres = lib.pipe super.beam-postgres [ # Requires pg_ctl command during tests @@ -1267,10 +1274,13 @@ builtins.intersectAttrs super { (dontCheckIf (!pkgs.postgresql.doInstallCheck || !self.testcontainers.doCheck)) ]; - users-postgresql-simple = addTestToolDepends [ - pkgs.postgresql - pkgs.postgresqlTestHook - ] super.users-postgresql-simple; + users-postgresql-simple = lib.pipe super.users-postgresql-simple [ + (addTestToolDepends [ + pkgs.postgresql + pkgs.postgresqlTestHook + ]) + (dontCheckIf pkgs.postgresqlTestHook.meta.broken) + ]; esqueleto = overrideCabal