From 175e8da441a6384d93f27461c7dd3d3ecf0a2f8c Mon Sep 17 00:00:00 2001 From: Marc Scholten Date: Mon, 20 Apr 2026 11:20:02 +0100 Subject: [PATCH] haskellPackages.postgresql-simple-postgresql-types: unbreak The only test suite requires testcontainers-postgresql (docker); skip it with dontCheck. Also drops postgresql-simple-postgresql-types from transitive-broken.yaml now that postgresql-types is unbroken. Co-Authored-By: Claude Opus 4.7 (1M context) --- .../configuration-hackage2nix/transitive-broken.yaml | 1 - pkgs/development/haskell-modules/configuration-nix.nix | 3 +++ pkgs/development/haskell-modules/hackage-packages.nix | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index e91307b9fee9..2a31d388fb59 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -2694,7 +2694,6 @@ dont-distribute-packages: - postgresql-common-persistent - postgresql-pure - postgresql-simple-ltree - - postgresql-simple-postgresql-types - postgresql-simple-queue - postgresql-simple-typed - postgresql-tx-query diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 06f3f9204c76..8be5bf388a7f 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1480,6 +1480,9 @@ builtins.intersectAttrs super { # integration-tests suite needs docker/testcontainers; run only unit-tests. postgresql-types = overrideCabal { testTargets = [ "unit-tests" ]; } super.postgresql-types; + # only test suite is testcontainers/docker-based + postgresql-simple-postgresql-types = dontCheck super.postgresql-simple-postgresql-types; + users-postgresql-simple = lib.pipe super.users-postgresql-simple [ (addTestToolDepends [ pkgs.postgresql diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 48a652ea9b92..f23028f05d10 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -550882,7 +550882,6 @@ self: { ]; description = "Integration of \"postgresql-simple\" with \"postgresql-types\""; license = lib.meta.getLicenseFromSpdxId "MIT"; - hydraPlatforms = lib.platforms.none; } ) { };