Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 807854e9378f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c265b61fb92d
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 11, 2020

  1. haskell-language-server: Fix hydra config for deps

    @maralorn
    maralorn committed Nov 11, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    c265b61 View commit details
Showing with 5 additions and 3 deletions.
  1. +5 −3 pkgs/development/haskell-modules/configuration-common.nix
8 changes: 5 additions & 3 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -1452,10 +1452,10 @@ self: super: {
# INSERT NEW OVERRIDES ABOVE THIS LINE
} // (let
# fourmolu can‘t compile with an older aeson
overrideAeson = name: value: value.overrideScope (self: super: {
localOverride = name: value: doDistribute (value.overrideScope (self: super: {
aeson = dontCheck super.aeson_1_5_2_0;
});
in pkgs.lib.mapAttrs overrideAeson {
}));
in pkgs.lib.mapAttrs localOverride {
# tons of overrides for bleeding edge versions for ghcide and hls
# overriding aeson on all of them to prevent double compilations
# this shouldn‘t break anything because nearly all their reverse deps are
@@ -1469,6 +1469,8 @@ self: super: {
ghc-exactprint = dontCheck super.ghc-exactprint_0_6_3_2;
hie-bios = dontCheck super.hie-bios_0_7_1;
lsp-test = dontCheck super.lsp-test_0_11_0_7;
hls-plugin-api = super.hls-plugin-api;
implicit-hie-cradle = super.implicit-hie-cradle;
# the hls brittany is objectively better, because there hasn‘t been a
# brittany release in a while and this version works with 8.10.
# And we need to build it anyways.