about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorRobert Hensing <robert@roberthensing.nl>2024-01-05 14:06:19 +0100
committerRobert Hensing <robert@roberthensing.nl>2024-01-15 11:59:00 +0100
commit488534ae5e6286c6b364d59708d1d09115482e44 (patch)
tree847292d2e1c8a0aca7c62ff7d1700472bdb5c2b1 /pkgs
parent0dd36ea5c38c7b7a9c9943f23d5e45352b435d12 (diff)
downloadnixlib-488534ae5e6286c6b364d59708d1d09115482e44.tar
nixlib-488534ae5e6286c6b364d59708d1d09115482e44.tar.gz
nixlib-488534ae5e6286c6b364d59708d1d09115482e44.tar.bz2
nixlib-488534ae5e6286c6b364d59708d1d09115482e44.tar.lz
nixlib-488534ae5e6286c6b364d59708d1d09115482e44.tar.xz
nixlib-488534ae5e6286c6b364d59708d1d09115482e44.tar.zst
nixlib-488534ae5e6286c6b364d59708d1d09115482e44.zip
haskellPackages.postgresql-simple-migration: Enable check
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix11
-rw-r--r--pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml1
2 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 412510f9988c..2b35c4d56b10 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -688,7 +688,6 @@ self: super: {
   pipes-websockets = dontCheck super.pipes-websockets;
   posix-pty = dontCheck super.posix-pty; # https://github.com/merijn/posix-pty/issues/12
   postgresql-binary = dontCheck super.postgresql-binary; # needs a running postgresql server
-  postgresql-simple-migration = dontCheck super.postgresql-simple-migration;
   powerdns = dontCheck super.powerdns; # Tests require networking and external services
   process-streaming = dontCheck super.process-streaming;
   punycode = dontCheck super.punycode;
@@ -1365,6 +1364,16 @@ self: super: {
       ];
     })
     super.postgresql-simple;
+  postgresql-simple-migration = overrideCabal (drv: {
+      preCheck = ''
+        PGUSER=test
+        PGDATABASE=test
+      '';
+      testToolDepends = drv.testToolDepends or [] ++ [
+        pkgs.postgresql
+        pkgs.postgresqlTestHook
+      ];
+    }) (doJailbreak super.postgresql-simple-migration);
   beam-postgres = overrideCabal (drv: {
     # https://github.com/NixOS/nixpkgs/issues/198495
     doCheck = pkgs.postgresql.doCheck;
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
index c0d8dbe177e2..77762ba01020 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@@ -4303,7 +4303,6 @@ broken-packages:
   - postgresql-replicant # failure in job https://hydra.nixos.org/build/233247943 at 2023-09-02
   - postgresql-resilient # failure in job https://hydra.nixos.org/build/233212362 at 2023-09-02
   - postgresql-simple-bind # failure in job https://hydra.nixos.org/build/233220640 at 2023-09-02
-  - postgresql-simple-migration # failure in job https://hydra.nixos.org/build/233222723 at 2023-09-02
   - postgresql-simple-named # failure in job https://hydra.nixos.org/build/233202481 at 2023-09-02
   - postgresql-simple-sop # failure in job https://hydra.nixos.org/build/233249757 at 2023-09-02
   - postgresql-tx-monad-logger # failure in job https://hydra.nixos.org/build/233227034 at 2023-09-02