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

haskellPackages.hls-ghcide: Fix hydra-build

Browse Source 
Rearrange the scope override of the haskell-language-server in a way
that intermediate packages don‘t cause build fails on hydra.
This commit is contained in:
Malte Brandy 2020-08-16 20:33:47 +02:00
parent c8e5633c7a
commit c2923311e4
No known key found for this signature in database
GPG Key ID: 226A2D41EF5378C9
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1323,23 +1323,6 @@ self: super: {
# https://github.com/ennocramer/monad-dijkstra/issues/4 # https://github.com/ennocramer/monad-dijkstra/issues/4
monad-dijkstra = dontCheck (doJailbreak super.monad-dijkstra); monad-dijkstra = dontCheck (doJailbreak super.monad-dijkstra);
fourmolu = super.fourmolu.overrideScope (self: super: {
aeson = dontCheck self.aeson_1_5_2_0;
});
# Tests disabled because they access /home
haskell-language-server = (dontCheck super.haskell-language-server).overrideScope (self: super: {
# haskell-language-server uses its own fork of ghcide
# Test disabled: it seems to freeze (is it just that it takes a long time ?)
ghcide = dontCheck super.hls-ghcide;
# we are faster than stack here
hie-bios = dontCheck self.hie-bios_0_6_2;
lsp-test = dontCheck self.lsp-test_0_11_0_4;
# fourmolu can‘t compile with an older aeson
aeson = dontCheck super.aeson_1_5_2_0;
# brittany has an aeson upper bound of 1.5
brittany = doJailbreak super.brittany;
});
# https://github.com/kowainik/policeman/issues/57 # https://github.com/kowainik/policeman/issues/57
policeman = doJailbreak super.policeman; policeman = doJailbreak super.policeman;
@ -1450,4 +1433,24 @@ self: super: {
# https://github.com/bos/statistics/issues/170 # https://github.com/bos/statistics/issues/170
statistics = dontCheck super.statistics; statistics = dontCheck super.statistics;
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super # INSERT NEW OVERRIDES ABOVE THIS LINE
} // (let
hlsScopeOverride = self: super: {
# haskell-language-server uses its own fork of ghcide
# Test disabled: it seems to freeze (is it just that it takes a long time ?)
ghcide = dontCheck self.hls-ghcide;
# we are faster than stack here
hie-bios = dontCheck self.hie-bios_0_6_2;
lsp-test = dontCheck self.lsp-test_0_11_0_4;
# fourmolu can‘t compile with an older aeson
aeson = dontCheck super.aeson_1_5_2_0;
# brittany has an aeson upper bound of 1.5
brittany = doJailbreak super.brittany;
};
in {
haskell-language-server = dontCheck (super.haskell-language-server.overrideScope hlsScopeOverride);
hls-ghcide = dontCheck (super.hls-ghcide.overrideScope hlsScopeOverride);
fourmolu = super.fourmolu.overrideScope hlsScopeOverride;
}
) // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super