mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 04:19:00 +02:00
haskellPackages.*: disable postgresql tests on darwin
Co-authored-by: sternenseemann <sternenseemann@systemli.org>
This commit is contained in:
parent
353f91c930
commit
9d697a3be3
|
@ -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=""
|
||||
|
|
|
@ -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; });
|
||||
|
||||
|
|
Loading…
Reference in a new issue