nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 07:53:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

haskellPackages.haskell-language-server: 0.2.0.0 -> 0.2.2.0

Browse Source
This commit is contained in:
Malte Brandy 2020-07-24 15:03:25 +02:00
parent 0351afda02
commit ccb418a358
No known key found for this signature in database
GPG Key ID: 226A2D41EF5378C9
4 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/haskell-modules/configuration-common.nix
View File

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

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

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

29
pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix
View File

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

2
pkgs/development/tools/haskell/haskell-language-server/update.sh
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 "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}..." 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"
# =========================== # ===========================