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

Merge pull request #108807 from maralorn/hls 

haskelPackages.haskell-language-server: 0.7.1 -> 0.8.0
This commit is contained in:
Peter Simons 2021-01-08 21:00:36 +01:00 committed by GitHub
parent 8e68a5e5c3 7829f94244
commit 063a71690d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 80 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/haskell-modules/non-hackage-packages.nix
View File

@ -25,6 +25,8 @@ self: super: {
hls-tactics-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-tactics-plugin.nix { }; hls-tactics-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-tactics-plugin.nix { };
hls-explicit-imports-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix { }; hls-explicit-imports-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix { };
hls-retrie-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-retrie-plugin.nix { }; hls-retrie-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-retrie-plugin.nix { };
hls-class-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-class-plugin.nix { };
hls-eval-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-eval-plugin.nix { };
nix-output-monitor = self.callPackage ../../tools/nix/nix-output-monitor { }; nix-output-monitor = self.callPackage ../../tools/nix/nix-output-monitor { };

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

@ -2,21 +2,23 @@
, bytestring, containers, data-default, deepseq, directory, extra , bytestring, containers, data-default, deepseq, directory, extra
, fetchgit, filepath, floskell, fourmolu, ghc, ghc-boot-th , fetchgit, filepath, floskell, fourmolu, ghc, ghc-boot-th
, ghc-paths, ghcide, gitrev, hashable, haskell-lsp, hie-bios , ghc-paths, ghcide, gitrev, hashable, haskell-lsp, hie-bios
, hls-explicit-imports-plugin, hls-hlint-plugin, hls-plugin-api , hls-class-plugin, hls-eval-plugin, hls-explicit-imports-plugin
, hls-retrie-plugin, hls-tactics-plugin, hslogger, hspec , hls-hlint-plugin, hls-plugin-api, hls-retrie-plugin
, hspec-core, lens, lsp-test, mtl, optparse-applicative , hls-tactics-plugin, hslogger, hspec, hspec-core
, hspec-expectations, lens, lsp-test, mtl, optparse-applicative
, optparse-simple, ormolu, process, regex-tdfa, safe-exceptions , optparse-simple, ormolu, process, regex-tdfa, safe-exceptions
, shake, stdenv, stm, stylish-haskell, tasty, tasty-ant-xml , shake, stdenv, stm, stylish-haskell, tasty, tasty-ant-xml
, tasty-expected-failure, tasty-golden, tasty-hunit, tasty-rerun , tasty-expected-failure, tasty-golden, tasty-hunit, tasty-rerun
, temporary, text, time, transformers, unordered-containers, yaml , temporary, text, transformers, unordered-containers, with-utf8
, yaml
}: }:
mkDerivation { mkDerivation {
pname = "haskell-language-server"; pname = "haskell-language-server";
version = "0.7.1.0"; version = "0.8.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 = "0gkzvjx4dgf53yicinqjshlj80gznx5khb62i7g3kqjr85iy0raa"; sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588";
rev = "e4f677e1780fe85a02b99a09404a0a3c3ab5ce7c"; rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5";
fetchSubmodules = true; fetchSubmodules = true;
}; };
isLibrary = true; isLibrary = true;
@ -29,19 +31,20 @@ mkDerivation {
executableHaskellDepends = [ executableHaskellDepends = [
aeson base binary brittany bytestring containers deepseq directory aeson base binary brittany bytestring containers deepseq directory
extra filepath floskell fourmolu ghc ghc-boot-th ghc-paths ghcide extra filepath floskell fourmolu ghc ghc-boot-th ghc-paths ghcide
gitrev hashable haskell-lsp hie-bios hls-explicit-imports-plugin gitrev hashable haskell-lsp hie-bios hls-class-plugin
hls-hlint-plugin hls-plugin-api hls-retrie-plugin hls-eval-plugin hls-explicit-imports-plugin hls-hlint-plugin
hls-tactics-plugin hslogger lens mtl optparse-applicative hls-plugin-api hls-retrie-plugin hls-tactics-plugin hslogger lens
optparse-simple ormolu process regex-tdfa safe-exceptions shake mtl optparse-applicative optparse-simple ormolu process regex-tdfa
stylish-haskell temporary text time transformers safe-exceptions shake stylish-haskell temporary text transformers
unordered-containers unordered-containers with-utf8
]; ];
testHaskellDepends = [ testHaskellDepends = [
aeson base blaze-markup bytestring containers data-default aeson base blaze-markup bytestring containers data-default
directory extra filepath haskell-lsp hie-bios hls-plugin-api directory extra filepath haskell-lsp hie-bios hls-plugin-api
hslogger hspec hspec-core lens lsp-test process stm tasty hslogger hspec hspec-core hspec-expectations lens lsp-test process
tasty-ant-xml tasty-expected-failure tasty-golden tasty-hunit stm tasty tasty-ant-xml tasty-expected-failure tasty-golden
tasty-rerun temporary text transformers unordered-containers yaml tasty-hunit tasty-rerun temporary text transformers
unordered-containers yaml
]; ];
testToolDepends = [ ghcide ]; testToolDepends = [ ghcide ];
homepage = "https://github.com/haskell/haskell-language-server#readme"; homepage = "https://github.com/haskell/haskell-language-server#readme";

21
pkgs/development/tools/haskell/haskell-language-server/hls-class-plugin.nix Normal file
View File

@ -0,0 +1,21 @@
{ mkDerivation, aeson, base, containers, fetchgit, ghc
, ghc-exactprint, ghcide, haskell-lsp, hls-plugin-api, lens, shake
, stdenv, text, transformers, unordered-containers
}:
mkDerivation {
pname = "hls-class-plugin";
version = "0.1.0.0";
src = fetchgit {
url = "https://github.com/haskell/haskell-language-server.git";
sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588";
rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5";
fetchSubmodules = true;
};
postUnpack = "sourceRoot+=/plugins/hls-class-plugin; echo source root reset to $sourceRoot";
libraryHaskellDepends = [
aeson base containers ghc ghc-exactprint ghcide haskell-lsp
hls-plugin-api lens shake text transformers unordered-containers
];
description = "Explicit imports plugin for Haskell Language Server";
license = stdenv.lib.licenses.asl20;
}

27
pkgs/development/tools/haskell/haskell-language-server/hls-eval-plugin.nix Normal file
View File

@ -0,0 +1,27 @@
{ mkDerivation, aeson, base, containers, deepseq, Diff, directory
, extra, fetchgit, filepath, ghc, ghc-boot-th, ghc-paths, ghcide
, hashable, haskell-lsp, haskell-lsp-types, hls-plugin-api
, parser-combinators, pretty-simple, QuickCheck, safe-exceptions
, shake, stdenv, temporary, text, time, transformers
, unordered-containers
}:
mkDerivation {
pname = "hls-eval-plugin";
version = "0.1.0.0";
src = fetchgit {
url = "https://github.com/haskell/haskell-language-server.git";
sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588";
rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5";
fetchSubmodules = true;
};
postUnpack = "sourceRoot+=/plugins/hls-eval-plugin; echo source root reset to $sourceRoot";
libraryHaskellDepends = [
aeson base containers deepseq Diff directory extra filepath ghc
ghc-boot-th ghc-paths ghcide hashable haskell-lsp haskell-lsp-types
hls-plugin-api parser-combinators pretty-simple QuickCheck
safe-exceptions shake temporary text time transformers
unordered-containers
];
description = "Eval plugin for Haskell Language Server";
license = stdenv.lib.licenses.asl20;
}

4
pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix
View File

@ -7,8 +7,8 @@ mkDerivation {
version = "0.1.0.0"; version = "0.1.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 = "0gkzvjx4dgf53yicinqjshlj80gznx5khb62i7g3kqjr85iy0raa"; sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588";
rev = "e4f677e1780fe85a02b99a09404a0a3c3ab5ce7c"; rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5";
fetchSubmodules = true; fetchSubmodules = true;
}; };
postUnpack = "sourceRoot+=/plugins/hls-explicit-imports-plugin; echo source root reset to $sourceRoot"; postUnpack = "sourceRoot+=/plugins/hls-explicit-imports-plugin; echo source root reset to $sourceRoot";

4
pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix
View File

@ -10,8 +10,8 @@ mkDerivation {
version = "0.1.0.0"; version = "0.1.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 = "0gkzvjx4dgf53yicinqjshlj80gznx5khb62i7g3kqjr85iy0raa"; sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588";
rev = "e4f677e1780fe85a02b99a09404a0a3c3ab5ce7c"; rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5";
fetchSubmodules = true; fetchSubmodules = true;
}; };
postUnpack = "sourceRoot+=/plugins/hls-hlint-plugin; echo source root reset to $sourceRoot"; postUnpack = "sourceRoot+=/plugins/hls-hlint-plugin; echo source root reset to $sourceRoot";

4
pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix
View File

@ -8,8 +8,8 @@ mkDerivation {
version = "0.1.0.0"; version = "0.1.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 = "0gkzvjx4dgf53yicinqjshlj80gznx5khb62i7g3kqjr85iy0raa"; sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588";
rev = "e4f677e1780fe85a02b99a09404a0a3c3ab5ce7c"; rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5";
fetchSubmodules = true; fetchSubmodules = true;
}; };
postUnpack = "sourceRoot+=/plugins/hls-retrie-plugin; echo source root reset to $sourceRoot"; postUnpack = "sourceRoot+=/plugins/hls-retrie-plugin; echo source root reset to $sourceRoot";

4
pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix
View File

@ -10,8 +10,8 @@ mkDerivation {
version = "0.5.1.0"; version = "0.5.1.0";
src = fetchgit { src = fetchgit {
url = "https://github.com/haskell/haskell-language-server.git"; url = "https://github.com/haskell/haskell-language-server.git";
sha256 = "0gkzvjx4dgf53yicinqjshlj80gznx5khb62i7g3kqjr85iy0raa"; sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588";
rev = "e4f677e1780fe85a02b99a09404a0a3c3ab5ce7c"; rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5";
fetchSubmodules = true; fetchSubmodules = true;
}; };
postUnpack = "sourceRoot+=/plugins/tactics; echo source root reset to $sourceRoot"; postUnpack = "sourceRoot+=/plugins/tactics; echo source root reset to $sourceRoot";

7
pkgs/development/tools/haskell/haskell-language-server/update.sh
View File

@ -41,11 +41,10 @@ hls_new_version=$hls_latest_release
echo "Updating haskell-language-server from old version $hls_old_version to new version $hls_new_version." 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}..." 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" cabal2nix --revision "$hls_new_version" "https://github.com/haskell/haskell-language-server.git" > "$hls_derivation_file"
cabal2nix --revision "$hls_new_version" --subpath plugins/tactics "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/hls-tactics-plugin.nix" cabal2nix --revision "$hls_new_version" --subpath plugins/tactics "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/hls-tactics-plugin.nix"
cabal2nix --revision "$hls_new_version" --subpath plugins/hls-hlint-plugin "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/hls-hlint-plugin.nix" for plugin in "hls-hlint-plugin" "hls-explicit-imports-plugin" "hls-retrie-plugin" "hls-class-plugin" "hls-eval-plugin"; do
cabal2nix --revision "$hls_new_version" --subpath plugins/hls-explicit-imports-plugin "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/hls-explicit-imports-plugin.nix" cabal2nix --revision "$hls_new_version" --subpath plugins/$plugin "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/$plugin.nix"
cabal2nix --revision "$hls_new_version" --subpath plugins/hls-retrie-plugin "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/hls-retrie-plugin.nix" done
echo "Finished." echo "Finished."