Merge pull request #116841 from maralorn/hls

haskell-language-server: Fix build
This commit is contained in:
maralorn 2021-03-19 15:56:43 +01:00 committed by GitHub
commit 6e9ca2d926
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 124 additions and 5 deletions

View File

@ -1400,6 +1400,16 @@ self: super: {
# https://github.com/haskell/haskell-language-server/issues/611
haskell-language-server = dontCheck super.haskell-language-server;
# 2021-03-19: Too restrictive upper bound on optparse-applicative
stylish-haskell = doJailbreak super.stylish-haskell;
# 2021-03-19: https://github.com/facebookincubator/retrie/issues/24
retrie = doJailbreak super.retrie;
# Jailbreak because of restrictive upper bound on base16-bytestring
# 2021-03-19: https://github.com/Avi-D-coder/implicit-hie-cradle/pull/8
implicit-hie-cradle = doJailbreak super.implicit-hie-cradle;
# 2021-03-09: Overrides because nightly is to old for hls 1.0.0
lsp-test = doDistribute (dontCheck self.lsp-test_0_13_0_0);
@ -1409,7 +1419,8 @@ self: super: {
# 2021-03-21 Test hangs
# https://github.com/haskell/haskell-language-server/issues/1562
ghcide = dontCheck super.ghcide;
# Jailbreak because of: https://github.com/haskell/haskell-language-server/pull/1595
ghcide = doJailbreak (dontCheck super.ghcide);
# 2020-03-09: Tests broken in hackage release
# fixed on upstream, but not released in hiedb 0.3.0.1

View File

@ -73,6 +73,9 @@ default-package-overrides:
# gi-gdkx11-4.x requires gtk-4.x, which is still under development and
# not yet available in Nixpkgs
- gi-gdkx11 < 4
- hlint < 3.3 # We dont have ghc-lib-parser 9.0.X yet.
- ghcide < 1.1 # To stay hls 1.0 compatible
- hls-retrie-plugin < 1.0.0.1 # To stay hls 1.0 compatible
# Stackage Nightly 2021-03-17
- abstract-deque ==0.3

View File

@ -53453,8 +53453,6 @@ self: {
];
description = "A library of simple NLP algorithms";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
"chatty" = callPackage
@ -96516,8 +96514,6 @@ self: {
];
description = "Simple sentence segmenter";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
"funbot" = callPackage
@ -102279,6 +102275,69 @@ self: {
}) {};
"ghcide" = callPackage
({ mkDerivation, aeson, array, async, base, base16-bytestring
, binary, bytestring, bytestring-encoding, case-insensitive
, containers, cryptohash-sha1, data-default, deepseq, dependent-map
, dependent-sum, Diff, directory, dlist, extra, filepath
, fingertree, fuzzy, ghc, ghc-boot, ghc-boot-th, ghc-check
, ghc-exactprint, ghc-paths, ghc-typelits-knownnat, gitrev, Glob
, haddock-library, hashable, heapsize, hie-bios, hie-compat, hiedb
, hls-plugin-api, hp2pretty, hslogger, implicit-hie
, implicit-hie-cradle, lens, lsp, lsp-test, lsp-types, mtl
, network-uri, opentelemetry, optparse-applicative, parallel
, prettyprinter, prettyprinter-ansi-terminal, process, QuickCheck
, quickcheck-instances, record-dot-preprocessor, record-hasfield
, regex-tdfa, retrie, rope-utf16-splay, safe, safe-exceptions
, shake, shake-bench, sorted-list, sqlite-simple, stm, syb, tasty
, tasty-expected-failure, tasty-hunit, tasty-quickcheck
, tasty-rerun, text, time, transformers, unix, unliftio
, unliftio-core, unordered-containers, utf8-string, vector, yaml
}:
mkDerivation {
pname = "ghcide";
version = "1.0.0.0";
sha256 = "15hz49d68229bnp8g7q1ac60ryd4zbyc1rbxsfaq5lb586ps82k8";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson array async base base16-bytestring binary bytestring
bytestring-encoding case-insensitive containers cryptohash-sha1
data-default deepseq dependent-map dependent-sum Diff directory
dlist extra filepath fingertree fuzzy ghc ghc-boot ghc-boot-th
ghc-check ghc-exactprint ghc-paths Glob haddock-library hashable
heapsize hie-bios hie-compat hiedb hls-plugin-api hslogger
implicit-hie-cradle lens lsp lsp-types mtl network-uri
opentelemetry parallel prettyprinter prettyprinter-ansi-terminal
regex-tdfa retrie rope-utf16-splay safe safe-exceptions shake
sorted-list sqlite-simple stm syb text time transformers unix
unliftio unliftio-core unordered-containers utf8-string vector
];
executableHaskellDepends = [
aeson base bytestring containers data-default directory extra
filepath ghc gitrev hashable heapsize hie-bios hiedb hls-plugin-api
lens lsp lsp-test lsp-types optparse-applicative process
safe-exceptions shake text unordered-containers
];
testHaskellDepends = [
aeson base binary bytestring containers data-default directory
extra filepath ghc ghc-typelits-knownnat haddock-library
hls-plugin-api lens lsp lsp-test lsp-types network-uri
optparse-applicative process QuickCheck quickcheck-instances
record-dot-preprocessor record-hasfield rope-utf16-splay safe
safe-exceptions shake tasty tasty-expected-failure tasty-hunit
tasty-quickcheck tasty-rerun text
];
testToolDepends = [ implicit-hie ];
benchmarkHaskellDepends = [
aeson base directory extra filepath optparse-applicative shake
shake-bench text yaml
];
benchmarkToolDepends = [ hp2pretty implicit-hie ];
description = "The core of an IDE";
license = lib.licenses.asl20;
}) {};
"ghcide_1_1_0_0" = callPackage
({ mkDerivation, aeson, array, async, base, base16-bytestring
, binary, bytestring, bytestring-encoding, case-insensitive
, containers, cryptohash-sha1, data-default, deepseq, dependent-map
@ -102339,6 +102398,7 @@ self: {
benchmarkToolDepends = [ hp2pretty implicit-hie ];
description = "The core of an IDE";
license = lib.licenses.asl20;
hydraPlatforms = lib.platforms.none;
}) {};
"ghcjs-ajax" = callPackage
@ -129858,6 +129918,31 @@ self: {
}) {inherit (pkgs) libsass;};
"hlint" = callPackage
({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs
, containers, cpphs, data-default, directory, extra, file-embed
, filepath, filepattern, ghc, ghc-boot, ghc-boot-th
, ghc-lib-parser-ex, hscolour, process, refact, text, transformers
, uniplate, unordered-containers, utf8-string, vector, yaml
}:
mkDerivation {
pname = "hlint";
version = "3.2.7";
sha256 = "0z6gxndrh7blzapkdn6fq1pkbkjlmbgjbq9ydnvy2wm00fb3v73g";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson ansi-terminal base bytestring cmdargs containers cpphs
data-default directory extra file-embed filepath filepattern ghc
ghc-boot ghc-boot-th ghc-lib-parser-ex hscolour process refact text
transformers uniplate unordered-containers utf8-string vector yaml
];
executableHaskellDepends = [ base ];
description = "Source code suggestions";
license = lib.licenses.bsd3;
}) {};
"hlint_3_3" = callPackage
({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs
, containers, cpphs, data-default, directory, extra, file-embed
, filepath, filepattern, ghc-lib-parser, ghc-lib-parser-ex
@ -129880,6 +129965,7 @@ self: {
executableHaskellDepends = [ base ];
description = "Source code suggestions";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
}) {};
"hlint-test" = callPackage
@ -130146,6 +130232,24 @@ self: {
}) {};
"hls-retrie-plugin" = callPackage
({ mkDerivation, aeson, base, containers, deepseq, directory, extra
, ghc, ghcide, hashable, hls-plugin-api, lsp, lsp-types, retrie
, safe-exceptions, shake, text, transformers, unordered-containers
}:
mkDerivation {
pname = "hls-retrie-plugin";
version = "1.0.0.0";
sha256 = "1m4r6nxbq1lvjkl6g1i0lbxdx4zimw6g478alnqv8n208q6fiw26";
libraryHaskellDepends = [
aeson base containers deepseq directory extra ghc ghcide hashable
hls-plugin-api lsp lsp-types retrie safe-exceptions shake text
transformers unordered-containers
];
description = "Retrie integration plugin for Haskell Language Server";
license = lib.licenses.asl20;
}) {};
"hls-retrie-plugin_1_0_0_1" = callPackage
({ mkDerivation, aeson, base, containers, deepseq, directory, extra
, ghc, ghcide, hashable, hls-plugin-api, lsp, lsp-types, retrie
, safe-exceptions, shake, text, transformers, unordered-containers
@ -130161,6 +130265,7 @@ self: {
];
description = "Retrie integration plugin for Haskell Language Server";
license = lib.licenses.asl20;
hydraPlatforms = lib.platforms.none;
}) {};
"hls-splice-plugin" = callPackage