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

haskell-language-server: Use hackage version and cleanup

Browse Source
This commit is contained in:
Malte Brandy
2021-02-05 19:27:09 +01:00
committed by Peter Simons
parent b1d2e3b10f
commit bac09b7658
13 changed files with 80 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1405,28 +1405,20 @@ self: super: {
# quickcheck-instances is only used in the tests of binary-instances.
binary-instances = dontCheck super.binary-instances;
# tons of overrides for bleeding edge versions for ghcide and hls
# overriding aeson on all of them to prevent double compilations
# this shouldn‘t break anything because nearly all their reverse deps are
# in this list or marked as broken anyways
# 2020-11-19: Checks nearly fixed, but still disabled because of flaky tests:
# https://github.com/haskell/haskell-language-server/issues/610
# https://github.com/haskell/haskell-language-server/issues/611
haskell-language-server = dontCheck (super.haskell-language-server.override {
lsp-test = dontCheck self.lsp-test;
fourmolu = self.fourmolu_0_3_0_0;
});
haskell-language-server = dontCheck super.haskell-language-server;
# 2021-01-20
# apply-refact 0.9.0.0 get's a build error with hls-hlint-plugin 0.8.0
# https://github.com/haskell/haskell-language-server/issues/1240
apply-refact = super.apply-refact_0_8_2_1;
fourmolu = dontCheck super.fourmolu;
# 1. test requires internet
# 2. dependency shake-bench hasn't been published yet so we also need unmarkBroken and doDistribute
ghcide = doDistribute (unmarkBroken (dontCheck (super.ghcide_0_7_0_0.override { lsp-test = dontCheck self.lsp-test; })));
refinery = doDistribute super.refinery_0_3_0_0;
ghcide = doDistribute (unmarkBroken (dontCheck super.ghcide));
data-tree-print = doJailbreak super.data-tree-print;
# 2020-11-15: aeson 1.5.4.1 needs to new quickcheck-instances for testing

13
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View File

@@ -73,9 +73,11 @@ 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
# haskell-language-server 0.5.0.0 doesn't accept newer versions
- fourmolu ==0.2.*
- refinery ==0.2.*
- hls-plugin-api == 0.6.0.0 # Needed for hls 0.8.0
- hls-eval-plugin == 0.1.0.0 # Needed for hls 0.8.0
- hls-hlint-plugin == 0.1.0.0 # Needed for hls 0.8.0
- ghcide == 0.7.0.0 # Needed for hls 0.8.0
# Stackage Nightly 2021-02-02
- abstract-deque ==0.3
- abstract-par ==0.3.3
@@ -2709,7 +2711,6 @@ extra-packages:
- dependent-map == 0.2.4.0 # required by Hasura 1.3.1, 2020-08-20
- dependent-sum == 0.4 # required by Hasura 1.3.1, 2020-08-20
- network == 2.6.3.1 # required by pkgs/games/hedgewars/default.nix, 2020-11-15
- ghcide == 0.7.0.0 # Needed for hls 0.8.0
- apply-refact == 0.8.2.1 # Needed for hls 0.8.0
package-maintainers:
@@ -6038,7 +6039,6 @@ broken-packages:
- haskell-igraph
- haskell-in-space
- haskell-kubernetes
- haskell-language-server
- haskell-lsp-client
- haskell-ml
- haskell-mpfr
@@ -6468,9 +6468,6 @@ broken-packages:
- hlrdb
- hlrdb-core
- hls
- hls-explicit-imports-plugin
- hls-hlint-plugin
- hls-retrie-plugin
- hlwm
- hly
- hmark

4
pkgs/development/haskell-modules/configuration-nix.nix
View File

@@ -787,7 +787,7 @@ self: super: builtins.intersectAttrs super {
testTarget = "unit-tests";
};
haskell-language-server = overrideCabal super.haskell-language-server (drv: {
haskell-language-server = enableCabalFlag (enableCabalFlag (overrideCabal super.haskell-language-server (drv: {
postInstall = let
inherit (pkgs.lib) concatStringsSep take splitString;
ghc_version = self.ghc.version;
@@ -802,7 +802,7 @@ self: super: builtins.intersectAttrs super {
export PATH=$PATH:$PWD/dist/build/haskell-language-server:$PWD/dist/build/haskell-language-server-wrapper
export HOME=$TMPDIR
'';
});
})) "all-plugins") "all-formatters";
# tests depend on a specific version of solc
hevm = dontCheck (doJailbreak super.hevm);

124
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

@@ -94066,34 +94066,6 @@ self: {
}) {};
"fourmolu" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, directory
, dlist, exceptions, filepath, ghc-lib-parser, gitrev, hspec
, hspec-discover, HsYAML, HsYAML-aeson, mtl, optparse-applicative
, path, path-io, syb, text
}:
mkDerivation {
pname = "fourmolu";
version = "0.2.0.0";
sha256 = "1jak0xgd6gcbw7icyrblvqnvzjyyakpw2zfnqj1z958qyg763v52";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson base bytestring containers directory dlist exceptions
filepath ghc-lib-parser HsYAML HsYAML-aeson mtl syb text
];
executableHaskellDepends = [
base directory 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 = lib.licenses.bsd3;
}) {};
"fourmolu_0_3_0_0" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, directory
, dlist, exceptions, filepath, ghc-lib-parser, gitrev, hspec
, hspec-discover, HsYAML, HsYAML-aeson, mtl, optparse-applicative
@@ -94119,7 +94091,6 @@ self: {
testToolDepends = [ hspec-discover ];
description = "A formatter for Haskell source code";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
}) {};
"fp-ieee" = callPackage
@@ -101421,7 +101392,7 @@ self: {
license = lib.licenses.bsd3;
}) {};
"ghcide_0_7_0_0" = callPackage
"ghcide" = callPackage
({ mkDerivation, aeson, array, async, base, base16-bytestring
, binary, bytestring, case-insensitive, containers, cryptohash-sha1
, data-default, deepseq, directory, extra, filepath, fingertree
@@ -101480,7 +101451,7 @@ self: {
broken = true;
}) {shake-bench = null;};
"ghcide" = callPackage
"ghcide_0_7_3_0" = callPackage
({ mkDerivation, aeson, array, async, base, base16-bytestring
, binary, bytestring, case-insensitive, containers, cryptohash-sha1
, data-default, deepseq, directory, dlist, extra, filepath
@@ -117971,8 +117942,6 @@ self: {
testToolDepends = [ ghcide ];
description = "LSP server for GHC";
license = lib.licenses.asl20;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
"haskell-lexer" = callPackage
@@ -128968,6 +128937,28 @@ self: {
}) {};
"hls-eval-plugin" = callPackage
({ mkDerivation, 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
}:
mkDerivation {
pname = "hls-eval-plugin";
version = "0.1.0.0";
sha256 = "1rghn0p8qqh9vh0x1ib2w00vv74y8j9qj2ydhwc68viii03wpjan";
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 = lib.licenses.asl20;
}) {};
"hls-eval-plugin_0_2_0_0" = callPackage
({ mkDerivation, aeson, base, containers, deepseq, Diff, directory
, dlist, extra, filepath, ghc, ghc-boot-th, ghc-paths, ghcide
, hashable, haskell-lsp, haskell-lsp-types, hls-plugin-api, lens
@@ -128988,6 +128979,7 @@ self: {
];
description = "Eval plugin for Haskell Language Server";
license = lib.licenses.asl20;
hydraPlatforms = lib.platforms.none;
}) {};
"hls-exactprint-utils" = callPackage
@@ -129022,8 +129014,6 @@ self: {
];
description = "Explicit imports plugin for Haskell Language Server";
license = lib.licenses.asl20;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
"hls-haddock-comments-plugin" = callPackage
@@ -129043,6 +129033,29 @@ self: {
}) {};
"hls-hlint-plugin" = callPackage
({ mkDerivation, aeson, apply-refact, base, binary, bytestring
, containers, data-default, deepseq, Diff, directory, extra
, filepath, ghc, ghcide, hashable, haskell-lsp, hlint
, hls-plugin-api, hslogger, lens, regex-tdfa, shake, temporary
, text, transformers, unordered-containers
}:
mkDerivation {
pname = "hls-hlint-plugin";
version = "0.1.0.0";
sha256 = "1sjbdzdrl4r0ar75z5znrv5iyim2hmf52c6r5hgmyn7wmhzbpvnq";
revision = "1";
editedCabalFile = "1al6a1kzhymxrpq5mvz1nlyhfcnjsz3ygqkafa8llb6hzsff6m7s";
libraryHaskellDepends = [
aeson apply-refact base binary bytestring containers data-default
deepseq Diff directory extra filepath ghc ghcide hashable
haskell-lsp hlint hls-plugin-api hslogger lens regex-tdfa shake
temporary text transformers unordered-containers
];
description = "Hlint integration plugin with Haskell Language Server";
license = lib.licenses.asl20;
}) {};
"hls-hlint-plugin_0_2_0_0" = callPackage
({ mkDerivation, aeson, apply-refact, base, binary, bytestring
, containers, data-default, deepseq, Diff, directory, extra
, filepath, ghc, ghc-exactprint, ghcide, hashable, haskell-lsp
@@ -129062,10 +129075,29 @@ self: {
description = "Hlint integration plugin with Haskell Language Server";
license = lib.licenses.asl20;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
"hls-plugin-api" = callPackage
({ mkDerivation, aeson, base, containers, data-default, Diff
, hashable, haskell-lsp, hslogger, lens, process, regex-tdfa, shake
, text, unix, unordered-containers
}:
mkDerivation {
pname = "hls-plugin-api";
version = "0.6.0.0";
sha256 = "0dnd20mb0id0l2dz6j3ckfrjyfm3mjys0kf11z3a684i4bc0w1pi";
revision = "2";
editedCabalFile = "0726nm80c7xfg6bxac32bg8yjszw5b0fq27jsg0w7dg2rg4zy1ji";
libraryHaskellDepends = [
aeson base containers data-default Diff hashable haskell-lsp
hslogger lens process regex-tdfa shake text unix
unordered-containers
];
description = "Haskell Language Server API for plugin communication";
license = lib.licenses.asl20;
}) {};
"hls-plugin-api_0_7_0_0" = callPackage
({ mkDerivation, aeson, base, containers, data-default, Diff
, hashable, haskell-lsp, hslogger, lens, process, regex-tdfa, shake
, text, unix, unordered-containers
@@ -129081,6 +129113,7 @@ self: {
];
description = "Haskell Language Server API for plugin communication";
license = lib.licenses.asl20;
hydraPlatforms = lib.platforms.none;
}) {};
"hls-retrie-plugin" = callPackage
@@ -129100,8 +129133,6 @@ self: {
];
description = "Retrie integration plugin for Haskell Language Server";
license = lib.licenses.asl20;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
"hls-splice-plugin" = callPackage
@@ -215840,22 +215871,6 @@ self: {
}) {};
"refinery" = callPackage
({ mkDerivation, base, checkers, exceptions, hspec, logict, mmorph
, mtl, QuickCheck
}:
mkDerivation {
pname = "refinery";
version = "0.2.0.0";
sha256 = "0nsfmb5y8y0hanh3h03v0n8wa5frgj85gz8ycl8h5z045j2kk3wq";
libraryHaskellDepends = [ base exceptions logict mmorph mtl ];
testHaskellDepends = [
base checkers exceptions hspec logict mmorph mtl QuickCheck
];
description = "Toolkit for building proof automation systems";
license = lib.licenses.bsd3;
}) {};
"refinery_0_3_0_0" = callPackage
({ mkDerivation, base, checkers, exceptions, hspec, logict, mmorph
, mtl, QuickCheck
}:
@@ -215869,7 +215884,6 @@ self: {
];
description = "Toolkit for building proof automation systems";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
}) {};
"reflection" = callPackage

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

@@ -18,16 +18,6 @@ self: super: {
# https://github.com/spacchetti/spago/issues/512
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-hlint-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-hlint-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-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 { };
# cabal2nix --revision <rev> https://github.com/hasura/ci-info-hs.git