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

haskellPackages.haskell-language-server: 0.2.0 -> 0.3.0

Browse Source 
While we are at it I:
* Disable tests, because I can‘t keep up with the speed hls introduces
more tests that cause trouble in nixpkgs.
* Fix builds of fourmolu and retrie
* Remove the wrapper for hls which is obsolete because of improved
package detection in hie-bios. And added a note that this can be removed
for ghcide soon, too.
This commit is contained in:
Malte Brandy
2020-08-16 13:57:18 +02:00
parent 00a9d3f261
commit af017c431a
8 changed files with 88 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/haskell/haskell-language-server/default.nix
+18 -17
View File
@@ -1,30 +1,31 @@
{ 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, temporary, text, time, transformers
, unix, unordered-containers, yaml
, extra, fetchgit, filepath, floskell, fourmolu, ghc, ghc-boot-th
, ghc-paths, ghcide, gitrev, hashable, haskell-lsp
, haskell-lsp-types, hie-bios, hslogger, hspec, hspec-core, lens
, lsp-test, optparse-applicative, optparse-simple, ormolu, process
, regex-tdfa, retrie, safe-exceptions, shake, stdenv, stm
, stylish-haskell, tasty, tasty-ant-xml, tasty-expected-failure
, tasty-golden, tasty-hunit, tasty-rerun, temporary, text, time
, transformers, unix, unordered-containers, yaml
}:
mkDerivation {
pname = "haskell-language-server";
version = "0.2.2.0";
version = "0.3.0.0";
src = fetchgit {
url = "https://github.com/haskell/haskell-language-server.git";
sha256 = "0g9g2gyb0fidx16l741ky12djxh4cid9akvxa48105iq1gdihd8l";
rev = "12c0e4423263140e3d16e76681927ec69fe4929f";
sha256 = "0gh3sgy6a08d8d3q6r2qn5r817ilzka2qkp0g0y6wsx7rjwag0yx";
rev = "23dda97f583e8ff39993b89c01bbd1ac24187605";
fetchSubmodules = true;
};
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
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
deepseq Diff directory extra filepath floskell fourmolu ghc
ghc-boot-th ghcide gitrev hashable haskell-lsp hie-bios hslogger
lens optparse-simple ormolu process regex-tdfa retrie
safe-exceptions shake stylish-haskell temporary text time
transformers unix unordered-containers
];
executableHaskellDepends = [
@@ -36,9 +37,9 @@ mkDerivation {
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 process stm tasty
tasty-ant-xml tasty-expected-failure tasty-golden tasty-hunit
tasty-rerun temporary text transformers unordered-containers yaml
hspec hspec-core lens lsp-test process stm tasty tasty-ant-xml
tasty-expected-failure tasty-golden tasty-hunit tasty-rerun
temporary text transformers unordered-containers yaml
];
testToolDepends = [ ghcide ];
homepage = "https://github.com/haskell/haskell-language-server#readme";
pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix
+12 -12
View File
@@ -7,7 +7,7 @@
, hie-bios, hslogger, lens, lsp-test, mtl, network-uri
, opentelemetry, optparse-applicative, prettyprinter
, prettyprinter-ansi-terminal, process, QuickCheck
, quickcheck-instances, regex-tdfa, rope-utf16-splay
, quickcheck-instances, regex-tdfa, rope-utf16-splay, safe
, safe-exceptions, shake, sorted-list, stdenv, stm, syb, tasty
, tasty-expected-failure, tasty-hunit, tasty-quickcheck
, tasty-rerun, text, time, transformers, unix, unordered-containers
@@ -17,9 +17,9 @@ mkDerivation {
pname = "ghcide";
version = "0.2.0";
src = fetchgit {
url = "https://github.com/bubba/ghcide";
sha256 = "1kj2i86mkaxgxlrbmv2d24mch7hywgcy2n61z8paj21chncs1j5w";
rev = "7e895cfa53260b41996df707baec496a8f2c75dc";
url = "https://github.com/wz1000/ghcide";
sha256 = "1zq7ngaak8il91a309rl51dghzasnk4m2sm3av6d93cyqyra1hfc";
rev = "078e3d3c0d319f83841ccbcdc60ff5f0e243f6be";
fetchSubmodules = true;
};
isLibrary = true;
@@ -30,23 +30,23 @@ mkDerivation {
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
prettyprinter-ansi-terminal regex-tdfa rope-utf16-splay safe
safe-exceptions shake sorted-list stm syb text time transformers
unix unordered-containers utf8-string
];
executableHaskellDepends = [
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
lens lsp-test optparse-applicative process safe-exceptions text
unordered-containers
];
testHaskellDepends = [
aeson base bytestring containers directory extra filepath ghc
ghc-typelits-knownnat haddock-library haskell-lsp haskell-lsp-types
lens lsp-test network-uri optparse-applicative process QuickCheck
quickcheck-instances rope-utf16-splay safe-exceptions shake tasty
tasty-expected-failure tasty-hunit tasty-quickcheck tasty-rerun
text
aeson base binary bytestring containers directory extra filepath
ghc ghc-typelits-knownnat haddock-library haskell-lsp
haskell-lsp-types lens lsp-test network-uri optparse-applicative
process QuickCheck quickcheck-instances rope-utf16-splay safe
safe-exceptions shake tasty tasty-expected-failure tasty-hunit
tasty-quickcheck tasty-rerun text
];
benchmarkHaskellDepends = [
aeson base Chart Chart-diagrams diagrams diagrams-svg directory
pkgs/development/tools/haskell/haskell-language-server/update.sh
+1 -1
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/bubba/ghcide" > "$ghcide_derivation_file"
cabal2nix --revision "$ghcide_new_version" "https://github.com/wz1000/ghcide" > "$ghcide_derivation_file"
# ===========================