haskellPackages: fix build of gargoyle libs

This commit is contained in:
Alexandre Esteves 2024-05-04 02:01:22 +01:00
parent 26d2f291df
commit 3afb2cb944
4 changed files with 6 additions and 9 deletions

View File

@ -1366,6 +1366,12 @@ self: super: {
pkgs.postgresqlTestHook
] super.users-postgresql-simple;
# Need https://github.com/obsidiansystems/gargoyle/pull/45
gargoyle = doJailbreak super.gargoyle;
gargoyle-postgresql = doJailbreak super.gargoyle-postgresql;
gargoyle-postgresql-nix = doJailbreak (addBuildTool [pkgs.postgresql] super.gargoyle-postgresql-nix);
gargoyle-postgresql-connect = doJailbreak super.gargoyle-postgresql-connect;
# PortMidi needs an environment variable to have ALSA find its plugins:
# https://github.com/NixOS/nixpkgs/issues/6860
PortMidi = overrideCabal (drv: {

View File

@ -1899,7 +1899,6 @@ broken-packages:
- gang-of-threads # failure in job https://hydra.nixos.org/build/252716251 at 2024-03-16
- Ganymede # failure in job https://hydra.nixos.org/build/233248892 at 2023-09-02
- garepinoh # failure in job https://hydra.nixos.org/build/233238111 at 2023-09-02
- gargoyle # failure in job https://hydra.nixos.org/build/233196445 at 2023-09-02
- gas # failure in job https://hydra.nixos.org/build/233233966 at 2023-09-02
- gasp # failure in job https://hydra.nixos.org/build/252731457 at 2024-03-16
- gather # failure in job https://hydra.nixos.org/build/233208848 at 2023-09-02

View File

@ -1487,9 +1487,6 @@ dont-distribute-packages:
- galois-fft
- galois-field
- gamma
- gargoyle-postgresql
- gargoyle-postgresql-connect
- gargoyle-postgresql-nix
- gbs-downloader
- gbu
- gdax

View File

@ -114574,8 +114574,6 @@ self: {
];
description = "Automatically spin up and spin down local daemons";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
"gargoyle-postgresql" = callPackage
@ -114597,7 +114595,6 @@ self: {
];
description = "Manage PostgreSQL servers with gargoyle";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
}) {};
"gargoyle-postgresql-connect" = callPackage
@ -114615,7 +114612,6 @@ self: {
];
description = "Connect to gargoyle-managed postgresql instances";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
}) {};
"gargoyle-postgresql-nix" = callPackage
@ -114636,7 +114632,6 @@ self: {
];
description = "Manage PostgreSQL servers with gargoyle and nix";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
}) {};
"garlic-bread" = callPackage