b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

haskellPackages.*: disable postgresql tests on darwin

Browse source 
Co-authored-by: sternenseemann <sternenseemann@systemli.org>
This commit is contained in:
Weijia Wang 2022-10-29 18:42:59 +02:00 committed by sternenseemann
parent 353f91c930
commit 9d697a3be3
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -1105,6 +1105,8 @@ self: super: {
# Requires pg_ctl command during tests
beam-postgres = overrideCabal (drv: {
# https://github.com/NixOS/nixpkgs/issues/198495
doCheck = pkgs.postgresql.doCheck;
testToolDepends = (drv.testToolDepends or []) ++ [pkgs.postgresql];
}) super.beam-postgres;
@ -1127,6 +1129,8 @@ self: super: {
sed -i test/PostgreSQL/Test.hs \
-e s^host=localhost^^
'';
# https://github.com/NixOS/nixpkgs/issues/198495
doCheck = pkgs.postgresql.doCheck;
# Match the test suite defaults (or hardcoded values?)
preCheck = drv.preCheck or "" + ''
PGUSER=esqutest
@ -1267,6 +1271,8 @@ self: super: {
sed -i test/PgInit.hs \
-e s^'host=" <> host <> "'^^
'';
# https://github.com/NixOS/nixpkgs/issues/198495
doCheck = pkgs.postgresql.doCheck;
preCheck = drv.preCheck or "" + ''
PGDATABASE=test
PGUSER=test
@ -1471,6 +1477,8 @@ self: super: {
testToolDepends = drv.testToolDepends or [] ++ [
pkgs.postgresql pkgs.postgresqlTestHook
];
# https://github.com/NixOS/nixpkgs/issues/198495
doCheck = pkgs.postgresql.doCheck;
preCheck = drv.preCheck or "" + ''
# empty string means use default connection
export DATABASE_URL=""

6
pkgs/development/haskell-modules/configuration-nix.nix
View file

@ -901,7 +901,11 @@ self: super: builtins.intersectAttrs super {
'';
}) super.nvfetcher);
rel8 = addTestToolDepend pkgs.postgresql super.rel8;
rel8 = pkgs.lib.pipe super.rel8 [
(addTestToolDepend pkgs.postgresql)
# https://github.com/NixOS/nixpkgs/issues/198495
(overrideCabal { doCheck = pkgs.postgresql.doCheck; })
];
cachix = self.generateOptparseApplicativeCompletions [ "cachix" ] (super.cachix.override { nix = pkgs.nixVersions.nix_2_9; });