haskellPackages.hpqtypes: fix passing libpq as lib (#450594) (d2d30c93) · Commits · nix / nixpkgs

pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml

+0 −1

Original line number	Diff line number	Diff line
		@@ -2947,7 +2947,6 @@ broken-packages:
		- hpio # failure in job https://hydra.nixos.org/build/233215789 at 2023-09-02
		- hplaylist # failure in job https://hydra.nixos.org/build/233219978 at 2023-09-02
		- hpodder # failure in job https://hydra.nixos.org/build/233207276 at 2023-09-02
		- hpqtypes # failure in job https://hydra.nixos.org/build/233256283 at 2023-09-02
		- hps-kmeans # failure in job https://hydra.nixos.org/build/233207461 at 2023-09-02
		- hPushover # failure in job https://hydra.nixos.org/build/233215804 at 2023-09-02
		- hpygments # failure in job https://hydra.nixos.org/build/233258827 at 2023-09-02

pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml

+0 −6

Original line number	Diff line number	Diff line
		@@ -578,8 +578,6 @@ dont-distribute-packages:
		- constraint-manip
		- constraint-reflection
		- constructible
		- consumers
		- consumers-metrics-prometheus
		- container
		- containers-accelerate
		- content-store
		@@ -1620,8 +1618,6 @@ dont-distribute-packages:
		- hplayground
		- HPlot
		- HPong
		- hpqtypes-effectful
		- hpqtypes-extras
		- hprotoc
		- hprotoc-fork
		- hps
		@@ -2113,9 +2109,7 @@ dont-distribute-packages:
		- local-search
		- localize
		- locked-poll
		- log
		- log-effect-syslog
		- log-postgres
		- log-utils
		- log4hs
		- logging-effect-extra

pkgs/development/haskell-modules/configuration-nix.nix

+70 −0

Original line number	Diff line number	Diff line
		@@ -352,6 +352,76 @@ builtins.intersectAttrs super {
		gtksourceview2 = addPkgconfigDepend pkgs.gtk2 super.gtksourceview2;
		gtk-traymanager = addPkgconfigDepend pkgs.gtk3 super.gtk-traymanager;

		# These require postgres and pass the connection string manually via the CLI in tests.
		consumers = dontCheckIf pkgs.postgresqlTestHook.meta.broken (
		overrideCabal (drv: {
		preCheck = ''
		export postgresqlTestUserOptions="LOGIN SUPERUSER"
		export PGDATABASE=consumers
		'';
		testToolDepends = drv.testToolDepends or [ ] ++ [
		pkgs.postgresql
		pkgs.postgresqlTestHook
		];
		testTargets = [
		"consumers-test"
		"--test-option=--connection-string=\"host=$PGHOST user=$PGUSER dbname=$PGDATABASE\""
		];
		}) super.consumers
		);
		hpqtypes-extras = dontCheckIf pkgs.postgresqlTestHook.meta.broken (
		overrideCabal (drv: {
		preCheck = ''
		export postgresqlTestUserOptions="LOGIN SUPERUSER"
		export PGDATABASE=hpqtypes-extras
		'';
		testToolDepends = drv.testToolDepends or [ ] ++ [
		pkgs.postgresql
		pkgs.postgresqlTestHook
		];
		testTargets = [
		"hpqtypes-extras-tests"
		"--test-option=--connection-string=\"host=$PGHOST user=$PGUSER dbname=$PGDATABASE\""
		];
		}) super.hpqtypes-extras
		);
		hpqtypes = dontCheckIf pkgs.postgresqlTestHook.meta.broken (
		overrideCabal (drv: {
		preCheck = ''
		export postgresqlTestUserOptions="LOGIN SUPERUSER"
		export PGDATABASE=hpqtypes
		'';
		testToolDepends = drv.testToolDepends or [ ] ++ [
		pkgs.postgresql
		pkgs.postgresqlTestHook
		];
		testTargets = [
		"hpqtypes-tests"
		"--test-option=\"host=$PGHOST user=$PGUSER dbname=$PGDATABASE\""
		];
		}) (super.hpqtypes.override { libpq = pkgs.libpq; })
		);
		hpqtypes-effectful = dontCheckIf pkgs.postgresqlTestHook.meta.broken (
		overrideCabal
		(drv: {
		preCheck = ''
		export postgresqlTestUserOptions="LOGIN SUPERUSER"
		export PGDATABASE=hpqtypes-effectful
		'';
		testToolDepends = drv.testToolDepends or [ ] ++ [
		pkgs.postgresql
		pkgs.postgresqlTestHook
		];
		})
		(
		super.hpqtypes-effectful.overrideAttrs (drv: {
		postgresqlTestSetupPost = ''
		export DATABASE_URL="host=$PGHOST user=$PGUSER dbname=$PGDATABASE"
		'';
		})
		)
		);

		shelly = overrideCabal (drv: {
		# /usr/bin/env is unavailable in the sandbox
		preCheck = drv.preCheck or "" + ''

pkgs/development/haskell-modules/hackage-packages.nix

+0 −8

Original line number	Diff line number	Diff line
		@@ -159675,7 +159675,6 @@ self: {
		];
		description = "Concurrent PostgreSQL data consumers";
		license = lib.licenses.bsd3;
		hydraPlatforms = lib.platforms.none;
		}
		) { };

		@@ -159713,7 +159712,6 @@ self: {
		];
		description = "Prometheus metrics for the consumers library";
		license = lib.licenses.bsd3;
		hydraPlatforms = lib.platforms.none;
		}
		) { };

		@@ -342693,8 +342691,6 @@ self: {
		];
		description = "Haskell bindings to libpqtypes";
		license = lib.licenses.bsd3;
		hydraPlatforms = lib.platforms.none;
		broken = true;
		}
		) { inherit (pkgs) libpq; };

		@@ -342732,7 +342728,6 @@ self: {
		];
		description = "Adaptation of the hpqtypes library for the effectful ecosystem";
		license = lib.licenses.bsd3;
		hydraPlatforms = lib.platforms.none;
		}
		) { };

		@@ -342795,7 +342790,6 @@ self: {
		];
		description = "Extra utilities for hpqtypes library";
		license = lib.licenses.bsd3;
		hydraPlatforms = lib.platforms.none;
		}
		) { };

		@@ -426174,7 +426168,6 @@ self: {
		];
		description = "Structured logging solution with multiple backends";
		license = lib.licenses.bsd3;
		hydraPlatforms = lib.platforms.none;
		}
		) { };

		@@ -426471,7 +426464,6 @@ self: {
		];
		description = "Structured logging solution (PostgreSQL back end)";
		license = lib.licenses.bsd3;
		hydraPlatforms = lib.platforms.none;
		}
		) { };

Admin message