nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-14 17:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

haskellPackages: adapt to hspec hackage update

Browse Source
This commit is contained in:
sternenseemann 2021-11-19 17:59:47 +01:00
parent 6f0f4a92b5
commit 781daa41ef
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -1345,21 +1345,21 @@ self: super: {
resource-pool = self.hasura-resource-pool;
ekg-core = self.hasura-ekg-core;
ekg-json = self.hasura-ekg-json;
hspec = dontCheck self.hspec_2_8_4;
hspec-core = dontCheck self.hspec-core_2_8_4;
hspec-discover = dontCheck super.hspec-discover_2_8_4;
hspec = dontCheck self.hspec_2_9_1;
hspec-core = dontCheck self.hspec-core_2_9_1;
hspec-discover = dontCheck super.hspec-discover_2_9_1;
tasty-hspec = self.tasty-hspec_1_2;
}));
hasura-ekg-core = super.hasura-ekg-core.overrideScope (self: super: {
hspec = dontCheck self.hspec_2_8_4;
hspec-core = dontCheck self.hspec-core_2_8_4;
hspec-discover = dontCheck super.hspec-discover_2_8_4;
});
hasura-ekg-core = doJailbreak (super.hasura-ekg-core.overrideScope (self: super: {
hspec = dontCheck self.hspec_2_9_1;
hspec-core = dontCheck self.hspec-core_2_9_1;
hspec-discover = dontCheck super.hspec-discover_2_9_1;
}));
hasura-ekg-json = super.hasura-ekg-json.overrideScope (self: super: {
ekg-core = self.hasura-ekg-core;
hspec = dontCheck self.hspec_2_8_4;
hspec-core = dontCheck self.hspec-core_2_8_4;
hspec-discover = dontCheck super.hspec-discover_2_8_4;
hspec = dontCheck self.hspec_2_9_1;
hspec-core = dontCheck self.hspec-core_2_9_1;
hspec-discover = dontCheck super.hspec-discover_2_9_1;
});
pg-client = overrideCabal (drv: {
librarySystemDepends = with pkgs; [ postgresql krb5.dev openssl.dev ];
@ -2081,9 +2081,9 @@ EOT
# Jailbreak isn't sufficient, but this is ok as it's a leaf package.
hadolint = super.hadolint.overrideScope (self: super: {
language-docker = self.language-docker_10_3_0;
hspec = dontCheck self.hspec_2_8_4;
hspec-core = dontCheck self.hspec-core_2_8_4;
hspec-discover = dontCheck self.hspec-discover_2_8_4;
hspec = dontCheck self.hspec_2_9_1;
hspec-core = dontCheck self.hspec-core_2_9_1;
hspec-discover = dontCheck self.hspec-discover_2_9_1;
colourista = doJailbreak super.colourista;
});