Merge pull request #91279 from GuillaumeDesforges/haskell-language-server

haskell-language-server: init at 0.1.0.0
This commit is contained in:
Dennis Gosnell 2020-06-30 14:24:11 +09:00 committed by GitHub
commit bc6776a3b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 234 additions and 6 deletions

View File

@ -1416,6 +1416,46 @@ self: super: {
# See: https://github.com/robstewart57/rdf4h/issues/39 # See: https://github.com/robstewart57/rdf4h/issues/39
rdf4h = dontCheck super.rdf4h; rdf4h = dontCheck super.rdf4h;
# hasn't bumped upper bounds
# test fails: "floskell-test: styles/base.md: openBinaryFile: does not exist (No such file or directory)"
# https://github.com/ennocramer/floskell/issues/48
floskell = dontCheck (doJailbreak super.floskell);
# hasn't bumped upper bounds
# test fails because of a "Warning: Unused LANGUAGE pragma"
# https://github.com/ennocramer/monad-dijkstra/issues/4
monad-dijkstra = dontCheck (doJailbreak super.monad-dijkstra);
# haskell-language-server uses its own fork of ghcide
# Test disabled: it seems to freeze (is it just that it takes a long time ?)
hls-ghcide =
dontCheck (
overrideCabal super.hls-ghcide
(old: {
# The integration test run by lsp-test requires the executable to be in the PATH
preCheck = ''
export PATH=$PATH:dist/build/ghcide
'';
})
);
haskell-language-server = (overrideCabal super.haskell-language-server
(old: {
# The integration test run by lsp-test requires the executable to be in the PATH
preCheck = ''
export PATH=$PATH:dist/build/haskell-language-server
'';
# test needs the git tool
testToolDepends = old.testToolDepends
++ [ pkgs.git ];
})).override {
# use a fork of ghcide
ghcide = self.hls-ghcide;
# use specific version
ormolu = super.ormolu_0_0_5_0;
};
# https://github.com/kowainik/policeman/issues/57 # https://github.com/kowainik/policeman/issues/57
policeman = doJailbreak super.policeman; policeman = doJailbreak super.policeman;

View File

@ -2586,6 +2586,7 @@ extra-packages:
- mtl-prelude < 2 # required for to build postgrest on mtl 2.1.x platforms - mtl-prelude < 2 # required for to build postgrest on mtl 2.1.x platforms
- network == 2.6.3.1 # newer versions don't compile with GHC 7.4.x and below - network == 2.6.3.1 # newer versions don't compile with GHC 7.4.x and below
- network == 3.0.* # required by network-bsd, HTTP, and many others (2019-04-30) - network == 3.0.* # required by network-bsd, HTTP, and many others (2019-04-30)
- ormolu == 0.0.5.0 # required by haskell-language-server
- pantry == 0.2.0.0 # required by stack-2.1.3.1 - pantry == 0.2.0.0 # required by stack-2.1.3.1
- parallel == 3.2.0.3 # newer versions don't work with GHC 6.12.3 - parallel == 3.2.0.3 # newer versions don't work with GHC 6.12.3
- patience ^>= 0.1 # required by chell-0.4.x - patience ^>= 0.1 # required by chell-0.4.x
@ -4988,7 +4989,6 @@ broken-packages:
- flite - flite
- float-binstring - float-binstring
- floating-bits - floating-bits
- floskell
- flow-er - flow-er
- flow2dot - flow2dot
- flowdock - flowdock
@ -7698,7 +7698,6 @@ broken-packages:
- monad-atom - monad-atom
- monad-atom-simple - monad-atom-simple
- monad-branch - monad-branch
- monad-dijkstra
- monad-exception - monad-exception
- monad-finally - monad-finally
- monad-fork - monad-fork

View File

@ -89273,8 +89273,6 @@ self: {
]; ];
description = "A flexible Haskell source code pretty printer"; description = "A flexible Haskell source code pretty printer";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
}) {}; }) {};
"flow" = callPackage "flow" = callPackage
@ -169531,8 +169529,6 @@ self: {
testHaskellDepends = [ base hlint tasty tasty-hspec ]; testHaskellDepends = [ base hlint tasty tasty-hspec ];
description = "A monad transformer for weighted graph searches"; description = "A monad transformer for weighted graph searches";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
}) {}; }) {};
"monad-exception" = callPackage "monad-exception" = callPackage
@ -184992,6 +184988,34 @@ self: {
broken = true; broken = true;
}) {}; }) {};
"ormolu_0_0_5_0" = callPackage
({ mkDerivation, base, bytestring, containers, dlist, exceptions
, filepath, ghc-lib-parser, gitrev, hspec, hspec-discover, mtl
, optparse-applicative, path, path-io, syb, text
}:
mkDerivation {
pname = "ormolu";
version = "0.0.5.0";
sha256 = "1sf22silpj89sldd7wanlr34nsv77bq0cf4i0q1x2r20pz7s4w4m";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base bytestring containers dlist exceptions ghc-lib-parser mtl syb
text
];
executableHaskellDepends = [
base ghc-lib-parser gitrev optparse-applicative text
];
testHaskellDepends = [
base containers filepath hspec path path-io text
];
testToolDepends = [ hspec-discover ];
description = "A formatter for Haskell source code";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"ormolu" = callPackage "ormolu" = callPackage
({ mkDerivation, base, bytestring, containers, dlist, exceptions ({ mkDerivation, base, bytestring, containers, dlist, exceptions
, filepath, ghc-lib-parser, gitrev, hspec, hspec-discover, mtl , filepath, ghc-lib-parser, gitrev, hspec, hspec-discover, mtl

View File

@ -16,4 +16,9 @@ self: super: {
# spago is not released to Hackage. # spago is not released to Hackage.
# https://github.com/spacchetti/spago/issues/512 # https://github.com/spacchetti/spago/issues/512
spago = self.callPackage ../tools/purescript/spago/spago.nix { }; spago = self.callPackage ../tools/purescript/spago/spago.nix { };
# HLS and its fork of ghcide that it uses
# both are auto-generated by pkgs/development/tools/haskell/haskell-language-server/update.sh
haskell-language-server = self.callPackage ../tools/haskell/haskell-language-server { };
hls-ghcide = self.callPackage ../tools/haskell/haskell-language-server/hls-ghcide.nix { };
} }

View File

@ -0,0 +1,49 @@
{ mkDerivation, aeson, async, base, base16-bytestring, binary
, blaze-markup, brittany, bytestring, Cabal, cabal-helper
, containers, cryptohash-sha1, data-default, deepseq, Diff
, directory, extra, fetchgit, filepath, floskell, ghc, ghc-check
, 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
}:
mkDerivation {
pname = "haskell-language-server";
version = "0.1.0.0";
src = fetchgit {
url = "https://github.com/haskell/haskell-language-server.git";
sha256 = "092i32kc9dakl6cg1dpckrb87g4k8s4w1nvrs5x85n9ncgkpqk25";
rev = "2a192db290bfe8640dafb6c1d650a0815e70d966";
fetchSubmodules = true;
};
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson base binary brittany bytestring Cabal 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
];
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
];
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
tasty-ant-xml tasty-expected-failure tasty-golden tasty-hunit
tasty-rerun text unordered-containers yaml
];
testToolDepends = [ ghcide ];
homepage = "https://github.com/haskell/haskell-language-server#readme";
description = "LSP server for GHC";
license = stdenv.lib.licenses.asl20;
}

View File

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

View File

@ -0,0 +1,53 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p cabal2nix jq curl
#
# This script will update the haskell-language-server derivation to the latest version using
# cabal2nix.
#
# Note that you should always try building haskell-language-server after updating it here, since
# some of the overrides in pkgs/development/haskell/configuration-nix.nix may
# need to be updated/changed.
set -eo pipefail
# This is the directory of this update.sh script.
script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
# ===========================
# ghcide fork on https://github.com/wz1000/ghcide
# ===========================
# ghcide derivation created with cabal2nix.
ghcide_derivation_file="${script_dir}/hls-ghcide.nix"
# This is the current revision of hls in Nixpkgs.
ghcide_old_version="$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$ghcide_derivation_file")"
# This is the revision of ghcide used by hls on GitHub.
ghcide_new_version=$(curl --silent "https://api.github.com/repos/haskell/haskell-language-server/contents/ghcide" | jq '.sha' --raw-output)
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"
# ===========================
# HLS
# ===========================
# hls derivation created with cabal2nix.
hls_derivation_file="${script_dir}/default.nix"
# This is the current revision of hls in Nixpkgs.
hls_old_version="$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$hls_derivation_file")"
# This is the latest release version of hls on GitHub.
hls_new_version=$(curl --silent "https://api.github.com/repos/haskell/haskell-language-server/commits/master" | jq '.sha' --raw-output)
echo "Updating haskell-language-server from old version $hls_old_version to new version $hls_new_version."
echo "Running cabal2nix and outputting to ${hls_derivation_file}..."
cabal2nix --revision "$hls_new_version" "https://github.com/haskell/haskell-language-server.git" > "$hls_derivation_file"
echo "Finished."