gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haskellPackages.HDBC-postgresql: unbreak

Browse Source 
We split pg_config from libpq a while ago, so need to provide it
manually for those packages that can't use pkgconfig.
This commit is contained in:
Wolfgang Walther
2025-05-01 22:27:40 +02:00
parent 290cac96c7
commit 0de580a4a1
4 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
View File

@@ -2538,7 +2538,6 @@ broken-packages:
- hdaemonize-buildfix # failure in job https://hydra.nixos.org/build/233225678 at 2023-09-02 - hdaemonize-buildfix # failure in job https://hydra.nixos.org/build/233225678 at 2023-09-02
- hdbc-aeson # failure in job https://hydra.nixos.org/build/233240596 at 2023-09-02 - hdbc-aeson # failure in job https://hydra.nixos.org/build/233240596 at 2023-09-02
- HDBC-mysql # failure in job https://hydra.nixos.org/build/233205323 at 2023-09-02 - HDBC-mysql # failure in job https://hydra.nixos.org/build/233205323 at 2023-09-02
- HDBC-postgresql # failure in job https://hydra.nixos.org/build/295090953 at 2025-04-22
- hdbc-postgresql-hstore # failure in job https://hydra.nixos.org/build/233201143 at 2023-09-02 - hdbc-postgresql-hstore # failure in job https://hydra.nixos.org/build/233201143 at 2023-09-02
- HDBC-postgresql-hstore # failure in job https://hydra.nixos.org/build/233243932 at 2023-09-02 - HDBC-postgresql-hstore # failure in job https://hydra.nixos.org/build/233243932 at 2023-09-02
- hdevtools # failure in job https://hydra.nixos.org/build/233229115 at 2023-09-02 - hdevtools # failure in job https://hydra.nixos.org/build/233229115 at 2023-09-02

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

@@ -2969,7 +2969,6 @@ dont-distribute-packages:
- regular-xmlpickler - regular-xmlpickler
- reheat - reheat
- rel8 - rel8
- relational-query-postgresql-pure
- relative-date - relative-date
- remote-json - remote-json
- remote-json-client - remote-json-client
@@ -3574,7 +3573,6 @@ dont-distribute-packages:
- type-structure - type-structure
- type-sub-th - type-sub-th
- typecheck-plugin-nat-simple_0_1_0_11 - typecheck-plugin-nat-simple_0_1_0_11
- typed-admin
- typed-encoding-encoding - typed-encoding-encoding
- typed-gui - typed-gui
- typed-streams - typed-streams

4
pkgs/development/haskell-modules/configuration-nix.nix
View File

@@ -1704,6 +1704,10 @@ builtins.intersectAttrs super {
postgresql-libpq-pkgconfig = addPkgconfigDepend pkgs.libpq super.postgresql-libpq-pkgconfig; postgresql-libpq-pkgconfig = addPkgconfigDepend pkgs.libpq super.postgresql-libpq-pkgconfig;
HDBC-postgresql = overrideCabal (drv: {
libraryToolDepends = (drv.libraryToolDepends or [ ]) ++ [ pkgs.libpq.pg_config ];
}) super.HDBC-postgresql;
# Test failure is related to a GHC implementation detail of primitives and doesn't # Test failure is related to a GHC implementation detail of primitives and doesn't
# cause actual problems in dependent packages, see https://github.com/lehins/pvar/issues/4 # cause actual problems in dependent packages, see https://github.com/lehins/pvar/issues/4
pvar = dontCheck super.pvar; pvar = dontCheck super.pvar;

4
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

@@ -17731,8 +17731,6 @@ self: {
librarySystemDepends = [ libpq ]; librarySystemDepends = [ libpq ];
description = "PostgreSQL driver for HDBC"; description = "PostgreSQL driver for HDBC";
license = lib.licenses.bsd3; license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
broken = true;
} }
) { inherit (pkgs) libpq; }; ) { inherit (pkgs) libpq; };
@@ -564244,7 +564242,6 @@ self: {
]; ];
description = "The connector of relational-record and postgresql-pure"; description = "The connector of relational-record and postgresql-pure";
license = lib.licenses.bsd3; license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
} }
) { }; ) { };
@@ -685372,7 +685369,6 @@ self: {
]; ];
description = "Admin console framework"; description = "Admin console framework";
license = lib.licenses.bsd3; license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
} }
) { }; ) { };