Merge pull request #93768 from maralorn/hls

[haskell-updates] haskellPackages.haskell-language-server: 0.2.0.0 -> 0.2.2.0
This commit is contained in:
maralorn 2020-07-24 15:54:06 +02:00 committed by GitHub
commit 359d2e6892
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 37 additions and 36 deletions

View file

@ -1362,6 +1362,8 @@ self: super: {
preCheck = ''
export PATH=$PATH:dist/build/haskell-language-server
'';
# The wrapper test does not work for now.
testTarget = "func-test";
# test needs the git tool
testToolDepends = old.testToolDepends

View file

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

View file

@ -17,27 +17,28 @@ mkDerivation {
pname = "ghcide";
version = "0.2.0";
src = fetchgit {
url = "https://github.com/wz1000/ghcide";
sha256 = "12hqqi2qf0bnl8ap6bvc7nzz4d6817qf0kpkj7iimhbsn73fkqkv";
rev = "8530b980871f9bc4f6fc2e688a4620e5fe1a0340";
url = "https://github.com/bubba/ghcide";
sha256 = "1kj2i86mkaxgxlrbmv2d24mch7hywgcy2n61z8paj21chncs1j5w";
rev = "7e895cfa53260b41996df707baec496a8f2c75dc";
fetchSubmodules = true;
};
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson array async base binary bytestring containers data-default
deepseq directory extra filepath fuzzy ghc ghc-boot ghc-boot-th
haddock-library hashable haskell-lsp haskell-lsp-types hslogger mtl
network-uri opentelemetry prettyprinter prettyprinter-ansi-terminal
regex-tdfa rope-utf16-splay safe-exceptions shake sorted-list stm
syb text time transformers unix unordered-containers utf8-string
aeson array async base base16-bytestring binary bytestring
containers cryptohash-sha1 data-default deepseq directory extra
filepath fuzzy ghc ghc-boot ghc-boot-th ghc-check ghc-paths
haddock-library hashable haskell-lsp haskell-lsp-types hie-bios
hslogger mtl network-uri opentelemetry prettyprinter
prettyprinter-ansi-terminal regex-tdfa rope-utf16-splay
safe-exceptions shake sorted-list stm syb text time transformers
unix unordered-containers utf8-string
];
executableHaskellDepends = [
aeson async base base16-bytestring binary bytestring containers
cryptohash-sha1 data-default deepseq directory extra filepath ghc
ghc-check ghc-paths gitrev hashable haskell-lsp haskell-lsp-types
hie-bios hslogger lsp-test optparse-applicative process
safe-exceptions shake text time unordered-containers
aeson base bytestring containers data-default directory extra
filepath gitrev hashable haskell-lsp haskell-lsp-types hie-bios
lsp-test optparse-applicative process safe-exceptions text
unordered-containers
];
testHaskellDepends = [
aeson base bytestring containers directory extra filepath ghc

View file

@ -29,7 +29,7 @@ ghcide_new_version=$(curl --silent "https://api.github.com/repos/haskell/haskell
echo "Updating haskell-language-server from old version $ghcide_old_version to new version $ghcide_new_version."
echo "Running cabal2nix and outputting to ${ghcide_derivation_file}..."
cabal2nix --revision "$ghcide_new_version" "https://github.com/wz1000/ghcide" > "$ghcide_derivation_file"
cabal2nix --revision "$ghcide_new_version" "https://github.com/bubba/ghcide" > "$ghcide_derivation_file"
# ===========================