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

haskellPackages.haskell-language-server: 0.1.0.0 -> 0.2.0.0 

generated by
pkgs/development/tools/haskell/haskell-language-server/update.sh

with some manual tweaks
This commit is contained in:
Malte Brandy 2020-07-14 23:05:38 +02:00 committed by Peter Simons
parent 18121c65f3
commit 5e756f5f31
3 changed files with 35 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1358,15 +1358,18 @@ 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 ?)
hls-ghcide = hls-ghcide =
dontCheck ( dontCheck ((
overrideCabal super.hls-ghcide overrideCabal super.hls-ghcide
(old: { (old: {
# The integration test run by lsp-test requires the executable to be in the PATH # The integration test run by lsp-test requires the executable to be in the PATH
preCheck = '' preCheck = ''
export PATH=$PATH:dist/build/ghcide export PATH=$PATH:dist/build/ghcide
''; '';
}) })).override {
); # we are faster than stack here
hie-bios = dontCheck self.hie-bios_0_6_1;
lsp-test = dontCheck self.lsp-test_0_11_0_2;
});
haskell-language-server = (overrideCabal super.haskell-language-server haskell-language-server = (overrideCabal super.haskell-language-server
(old: { (old: {
@ -1381,8 +1384,9 @@ self: super: {
})).override { })).override {
# use a fork of ghcide # use a fork of ghcide
ghcide = self.hls-ghcide; ghcide = self.hls-ghcide;
# use specific version # we are faster than stack here
ormolu = super.ormolu_0_0_5_0; hie-bios = dontCheck self.hie-bios_0_6_1;
lsp-test = dontCheck self.lsp-test_0_11_0_2;
}; };
# https://github.com/kowainik/policeman/issues/57 # https://github.com/kowainik/policeman/issues/57

28
pkgs/development/tools/haskell/haskell-language-server/default.nix
View File

@ -1,28 +1,28 @@
{ mkDerivation, aeson, async, base, base16-bytestring, binary { mkDerivation, aeson, async, base, base16-bytestring, binary
, blaze-markup, brittany, bytestring, Cabal, cabal-helper , blaze-markup, brittany, bytestring, cabal-helper, containers
, containers, cryptohash-sha1, data-default, deepseq, Diff , cryptohash-sha1, data-default, deepseq, Diff, directory, extra
, directory, extra, fetchgit, filepath, floskell, ghc, ghc-check , fetchgit, filepath, floskell, ghc, ghc-check, ghc-paths, ghcide
, ghc-paths, ghcide, gitrev, hashable, haskell-lsp , gitrev, hashable, haskell-lsp, haskell-lsp-types, hie-bios
, haskell-lsp-types, hie-bios, hslogger, hspec, hspec-core , hslogger, hspec, hspec-core, hspec-expectations, lens, lsp-test
, hspec-expectations, lens, lsp-test, optparse-applicative , optparse-applicative, optparse-simple, ormolu, process
, optparse-simple, ormolu, process, regex-tdfa, safe-exceptions , regex-tdfa, safe-exceptions, shake, stdenv, stm, stylish-haskell
, shake, stdenv, stm, stylish-haskell, tasty, tasty-ant-xml , tasty, tasty-ant-xml, tasty-expected-failure, tasty-golden
, tasty-expected-failure, tasty-golden, tasty-hunit, tasty-rerun , tasty-hunit, tasty-rerun, text, time, transformers, unix
, text, time, transformers, unix, unordered-containers, yaml , unordered-containers, yaml
}: }:
mkDerivation { mkDerivation {
pname = "haskell-language-server"; pname = "haskell-language-server";
version = "0.1.0.0"; version = "0.2.0.0";
src = fetchgit { src = fetchgit {
url = "https://github.com/haskell/haskell-language-server.git"; url = "https://github.com/haskell/haskell-language-server.git";
sha256 = "092i32kc9dakl6cg1dpckrb87g4k8s4w1nvrs5x85n9ncgkpqk25"; sha256 = "0nkfyb0zg57jwr2gry0f3fycvqvb4rkayx42m841dgd4phyvrfrq";
rev = "2a192db290bfe8640dafb6c1d650a0815e70d966"; rev = "35205ee3f95a8fbb4ef9a4ae4d9d82ac3d36d3f0";
fetchSubmodules = true; fetchSubmodules = true;
}; };
isLibrary = true; isLibrary = true;
isExecutable = true; isExecutable = true;
libraryHaskellDepends = [ libraryHaskellDepends = [
aeson base binary brittany bytestring Cabal cabal-helper containers aeson base binary brittany bytestring cabal-helper containers
data-default deepseq Diff directory extra filepath floskell ghc data-default deepseq Diff directory extra filepath floskell ghc
ghcide gitrev hashable haskell-lsp hie-bios hslogger lens ghcide gitrev hashable haskell-lsp hie-bios hslogger lens
optparse-simple ormolu process regex-tdfa shake stylish-haskell optparse-simple ormolu process regex-tdfa shake stylish-haskell

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

@ -5,8 +5,8 @@
, 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, parser-combinators , opentelemetry, optparse-applicative, prettyprinter
, prettyprinter, prettyprinter-ansi-terminal, process, QuickCheck , prettyprinter-ansi-terminal, process, QuickCheck
, quickcheck-instances, regex-tdfa, rope-utf16-splay , quickcheck-instances, regex-tdfa, rope-utf16-splay
, safe-exceptions, shake, sorted-list, stdenv, stm, syb, tasty , safe-exceptions, shake, sorted-list, stdenv, stm, syb, tasty
, tasty-expected-failure, tasty-hunit, tasty-quickcheck , tasty-expected-failure, tasty-hunit, tasty-quickcheck
@ -18,8 +18,8 @@ mkDerivation {
version = "0.2.0"; version = "0.2.0";
src = fetchgit { src = fetchgit {
url = "https://github.com/wz1000/ghcide"; url = "https://github.com/wz1000/ghcide";
sha256 = "0rifbrfvbgv7szgwc5apzb0i5fbkr2spzqvwg5kzng5b4zrf9a9d"; sha256 = "12hqqi2qf0bnl8ap6bvc7nzz4d6817qf0kpkj7iimhbsn73fkqkv";
rev = "cc09b6d4cf03efa645c682347c62850c2291be25"; rev = "8530b980871f9bc4f6fc2e688a4620e5fe1a0340";
fetchSubmodules = true; fetchSubmodules = true;
}; };
isLibrary = true; isLibrary = true;
@ -36,21 +36,20 @@ mkDerivation {
aeson async base base16-bytestring binary bytestring containers aeson async base base16-bytestring binary bytestring containers
cryptohash-sha1 data-default deepseq directory extra filepath ghc cryptohash-sha1 data-default deepseq directory extra filepath ghc
ghc-check ghc-paths gitrev hashable haskell-lsp haskell-lsp-types ghc-check ghc-paths gitrev hashable haskell-lsp haskell-lsp-types
hie-bios hslogger optparse-applicative safe-exceptions shake text hie-bios hslogger lsp-test optparse-applicative process
time unordered-containers safe-exceptions shake text time unordered-containers
]; ];
testHaskellDepends = [ testHaskellDepends = [
aeson base bytestring containers directory extra filepath ghc aeson base bytestring containers directory extra filepath ghc
ghc-typelits-knownnat haddock-library haskell-lsp haskell-lsp-types ghc-typelits-knownnat haddock-library haskell-lsp haskell-lsp-types
lens lsp-test network-uri optparse-applicative parser-combinators lens lsp-test network-uri optparse-applicative process QuickCheck
process QuickCheck quickcheck-instances rope-utf16-splay quickcheck-instances rope-utf16-splay safe-exceptions shake tasty
safe-exceptions shake tasty tasty-expected-failure tasty-hunit tasty-expected-failure tasty-hunit tasty-quickcheck tasty-rerun
tasty-quickcheck tasty-rerun text text
]; ];
benchmarkHaskellDepends = [ benchmarkHaskellDepends = [
aeson base bytestring Chart Chart-diagrams containers diagrams aeson base Chart Chart-diagrams diagrams diagrams-svg directory
diagrams-svg directory extra filepath lsp-test optparse-applicative extra filepath shake text yaml
parser-combinators process safe-exceptions shake text yaml
]; ];
homepage = "https://github.com/digital-asset/ghcide#readme"; homepage = "https://github.com/digital-asset/ghcide#readme";
description = "The core of an IDE"; description = "The core of an IDE";