diff options
author | galagora <lightningstrikeiv@gmail.com> | 2020-09-11 14:10:19 +0300 |
---|---|---|
committer | galagora <lightningstrikeiv@gmail.com> | 2020-09-11 22:17:36 +0300 |
commit | e9b791e6a0a7b7cbc5bf17302cf6836bc2811007 (patch) | |
tree | ebb9d29c14be5e9a182f0ce37ea64299eaa9bafd /pkgs/development/haskell-modules/configuration-common.nix | |
parent | 0e8da16ac7d21039b64a8db0dadd18592264ea0c (diff) | |
download | nixpkgs-e9b791e6a0a7b7cbc5bf17302cf6836bc2811007.tar nixpkgs-e9b791e6a0a7b7cbc5bf17302cf6836bc2811007.tar.gz nixpkgs-e9b791e6a0a7b7cbc5bf17302cf6836bc2811007.tar.bz2 nixpkgs-e9b791e6a0a7b7cbc5bf17302cf6836bc2811007.tar.lz nixpkgs-e9b791e6a0a7b7cbc5bf17302cf6836bc2811007.tar.xz nixpkgs-e9b791e6a0a7b7cbc5bf17302cf6836bc2811007.tar.zst nixpkgs-e9b791e6a0a7b7cbc5bf17302cf6836bc2811007.zip |
haskell-language-server: add brittany fork
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
-rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index dd9a9463b3c..220af3b3684 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1473,7 +1473,7 @@ self: super: { # INSERT NEW OVERRIDES ABOVE THIS LINE } // (let - inherit (self) hls-ghcide; + inherit (self) hls-ghcide hls-brittany; 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 ?) @@ -1484,7 +1484,8 @@ self: super: { # 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; + brittany = hls-brittany; + data-tree-print = doJailbreak super.data-tree-print; }; in { # jailbreaking for hie-bios 0.7.0 (upstream PR: https://github.com/haskell/haskell-language-server/pull/357) @@ -1496,6 +1497,7 @@ self: super: { url = "https://github.com/haskell/ghcide/commit/3e1b3620948870a4da8808ca0c0897fbd3ecad16.patch"; sha256 = "1jwn7jgi740x6wwv1k0mz9d4z0b9p3mzs54pdg4nfq0h2v7zxchz"; }); + hls-brittany = dontCheck (super.hls-brittany.overrideScope hlsScopeOverride); fourmolu = super.fourmolu.overrideScope hlsScopeOverride; } ) // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super |