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

haskell-language-server: hls-ghcide 0.3.0 -> 0.4.0

Browse Source 
The patch is merged into master
This commit is contained in:
galagora 2020-09-11 14:13:34 +03:00
parent e9b791e6a0
commit 80328d9ea4
2 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1477,7 +1477,7 @@ self: super: {
hlsScopeOverride = self: super: { hlsScopeOverride = self: super: {
# haskell-language-server uses its own fork of ghcide # haskell-language-server uses its own fork of ghcide
# Test disabled: it seems to freeze (is it just that it takes a long time ?) # Test disabled: it seems to freeze (is it just that it takes a long time ?)
ghcide = hls-ghcide; ghcide = dontCheck hls-ghcide;
# we are faster than stack here # we are faster than stack here
hie-bios = dontCheck super.hie-bios_0_7_1; hie-bios = dontCheck super.hie-bios_0_7_1;
lsp-test = dontCheck super.lsp-test_0_11_0_5; lsp-test = dontCheck super.lsp-test_0_11_0_5;
@ -1490,13 +1490,7 @@ self: super: {
in { in {
# jailbreaking for hie-bios 0.7.0 (upstream PR: https://github.com/haskell/haskell-language-server/pull/357) # jailbreaking for hie-bios 0.7.0 (upstream PR: https://github.com/haskell/haskell-language-server/pull/357)
haskell-language-server = dontCheck (doJailbreak (super.haskell-language-server.overrideScope hlsScopeOverride)); haskell-language-server = dontCheck (doJailbreak (super.haskell-language-server.overrideScope hlsScopeOverride));
hls-ghcide = appendPatch (dontCheck (super.hls-ghcide.overrideScope hlsScopeOverride)) hls-ghcide = dontCheck (super.hls-ghcide.overrideScope hlsScopeOverride);
(pkgs.fetchpatch {
# This patch loosens the hie-bios upper bound.
# It is already merged into upstream and won‘t be needed for ghcide 0.4.0
url = "https://github.com/haskell/ghcide/commit/3e1b3620948870a4da8808ca0c0897fbd3ecad16.patch";
sha256 = "1jwn7jgi740x6wwv1k0mz9d4z0b9p3mzs54pdg4nfq0h2v7zxchz";
});
hls-brittany = dontCheck (super.hls-brittany.overrideScope hlsScopeOverride); hls-brittany = dontCheck (super.hls-brittany.overrideScope hlsScopeOverride);
fourmolu = super.fourmolu.overrideScope hlsScopeOverride; fourmolu = super.fourmolu.overrideScope hlsScopeOverride;
} }

29
pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix
View File

@ -5,21 +5,20 @@
, ghc-boot-th, ghc-check, ghc-paths, ghc-typelits-knownnat, gitrev , ghc-boot-th, ghc-check, ghc-paths, ghc-typelits-knownnat, gitrev
, haddock-library, hashable, haskell-lsp, haskell-lsp-types , haddock-library, hashable, haskell-lsp, haskell-lsp-types
, hie-bios, hslogger, lens, lsp-test, mtl, network-uri , hie-bios, hslogger, lens, lsp-test, mtl, network-uri
, opentelemetry, optparse-applicative, prettyprinter , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal
, prettyprinter-ansi-terminal, process, QuickCheck , process, QuickCheck, quickcheck-instances, regex-tdfa
, quickcheck-instances, regex-tdfa, rope-utf16-splay, safe , rope-utf16-splay, safe, safe-exceptions, shake, sorted-list
, safe-exceptions, shake, sorted-list, stdenv, stm, syb, tasty , stdenv, stm, syb, tasty, tasty-expected-failure, tasty-hunit
, tasty-expected-failure, tasty-hunit, tasty-quickcheck , tasty-quickcheck, tasty-rerun, text, time, transformers, unix
, tasty-rerun, text, time, transformers, unix, unordered-containers , unordered-containers, utf8-string, yaml
, utf8-string, yaml
}: }:
mkDerivation { mkDerivation {
pname = "ghcide"; pname = "ghcide";
version = "0.2.0"; version = "0.3.0";
src = fetchgit { src = fetchgit {
url = "https://github.com/haskell/ghcide"; url = "https://github.com/haskell/ghcide";
sha256 = "1zq7ngaak8il91a309rl51dghzasnk4m2sm3av6d93cyqyra1hfc"; sha256 = "15v3g3i5v0xbq50lfvl4bv3rx01nixiqx02sddqi5lj2idgmg24g";
rev = "078e3d3c0d319f83841ccbcdc60ff5f0e243f6be"; rev = "96cf8c53d0bdc16d3d2cd0559b74962593ce6dc5";
fetchSubmodules = true; fetchSubmodules = true;
}; };
isLibrary = true; isLibrary = true;
@ -29,10 +28,10 @@ mkDerivation {
containers cryptohash-sha1 data-default deepseq directory extra containers cryptohash-sha1 data-default deepseq directory extra
filepath fuzzy ghc ghc-boot ghc-boot-th ghc-check ghc-paths filepath fuzzy ghc ghc-boot ghc-boot-th ghc-check ghc-paths
haddock-library hashable haskell-lsp haskell-lsp-types hie-bios haddock-library hashable haskell-lsp haskell-lsp-types hie-bios
hslogger mtl network-uri opentelemetry prettyprinter hslogger mtl network-uri prettyprinter prettyprinter-ansi-terminal
prettyprinter-ansi-terminal regex-tdfa rope-utf16-splay safe regex-tdfa rope-utf16-splay safe safe-exceptions shake sorted-list
safe-exceptions shake sorted-list stm syb text time transformers stm syb text time transformers unix unordered-containers
unix unordered-containers utf8-string utf8-string
]; ];
executableHaskellDepends = [ executableHaskellDepends = [
aeson base bytestring containers data-default directory extra aeson base bytestring containers data-default directory extra
@ -52,7 +51,7 @@ mkDerivation {
aeson base Chart Chart-diagrams diagrams diagrams-svg directory aeson base Chart Chart-diagrams diagrams diagrams-svg directory
extra filepath shake text yaml extra filepath shake text yaml
]; ];
homepage = "https://github.com/digital-asset/ghcide#readme"; homepage = "https://github.com/haskell/ghcide#readme";
description = "The core of an IDE"; description = "The core of an IDE";
license = stdenv.lib.licenses.asl20; license = stdenv.lib.licenses.asl20;
} }