b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

haskell.packages.ghc810.haskell-language-server: Fix build

Browse source
This commit is contained in:
maralorn 2023-08-09 00:16:54 +02:00
parent 3f86662951
commit d58ec5127e
No known key found for this signature in database
3 changed files with 89 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
View file

@ -67,12 +67,6 @@ self: super: {
# Pick right versions for GHC-specific packages
ghc-api-compat = doDistribute (unmarkBroken self.ghc-api-compat_8_10_7);
# ghc versions which don’t match the ghc-lib-parser-ex version need the
# additional dependency to compile successfully.
ghc-lib-parser-ex = addBuildDepend self.ghc-lib-parser super.ghc-lib-parser-ex;
# Too strict lower bound on base
ghc-lib-parser = doJailbreak super.ghc-lib-parser;
# Needs to use ghc-lib due to incompatible GHC
ghc-tags = doDistribute (addBuildDepend self.ghc-lib self.ghc-tags_1_5);
@ -117,10 +111,22 @@ self: super: {
in addBuildDepends additionalDeps (super.haskell-language-server.overrideScope (lself: lsuper: {
Cabal = lself.Cabal_3_6_3_0;
aeson = lself.aeson_1_5_6_0;
lens-aeson = lself.lens-aeson_1_1_3;
lens-aeson = doJailbreak lself.lens-aeson_1_1_3;
lsp-types = doJailbreak lsuper.lsp-types; # Checks require aeson >= 2.0
hls-overloaded-record-dot-plugin = null;
}));
ghc-lib-parser = super.ghc-lib-parser_9_2_7_20230228;
ghc-lib-parser-ex = super.ghc-lib-parser-ex_9_2_1_1;
mod = super.mod_0_1_2_2;
path-io = doJailbreak super.path-io;
ormolu = self.ormolu_0_5_0_1;
fourmolu = dontCheck self.fourmolu_0_9_0_0;
hlint = self.hlint_3_4_1;
stylish-haskell = doJailbreak self.stylish-haskell_0_14_3_0;
hls-tactics-plugin = unmarkBroken (addBuildDepends (with self.hls-tactics-plugin.scope; [
aeson extra fingertree generic-lens ghc-exactprint ghc-source-gen ghcide
hls-graph hls-plugin-api hls-refactor-plugin hyphenation lens lsp megaparsec

10
pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
View file

@ -121,16 +121,16 @@ extra-packages:
- mmorph == 1.1.3 # Newest working version of mmorph on ghc 8.6.5. needed for hls
- network == 2.6.3.1 # required by pkgs/games/hedgewars/default.nix, 2020-11-15
- optparse-applicative < 0.16 # needed for niv-0.2.19
- ormolu == 0.1.4.1 # 2022-09-21: needed for hls on ghc 8.8
- ormolu == 0.2.* # 2022-02-21: For ghc 8.8 and 8.10
- ormolu == 0.5.0.1 # 2022-02-21: for hls on ghc 8.10
- ormolu == 0.5.2.0 # 2023-08-08: for hls on ghc 9.0 and 9.2
- fourmolu == 0.3.0.0 # 2022-09-21: needed for hls on ghc 8.8
- fourmolu == 0.10.1.0 # 2023-04-18: needed for hls on ghc 9.0 and 9.2
- fourmolu == 0.9.0.0 # 2022-09-21: for hls on ghc 8.10
- fourmolu == 0.10.1.0 # 2023-04-18: for hls on ghc 9.0 and 9.2
- mod == 0.1.2.2 # needed for hls on ghc 8.10
- pantry == 0.5.2.1 # needed for stack-2.7.3
- path == 0.9.0 # 2021-12-03: path version building with stackage genvalidity and GHC 9.0.2
- resolv < 0.2 # required to build cabal-install-3.10.1.0 with Stackage LTS 21
- sbv == 7.13 # required for pkgs.petrinizer
- stylish-haskell == 0.13.0.0 # 2022-09-19: needed for hls on ghc 8.8
- stylish-haskell == 0.14.3.0 # 2022-09-19: needed for hls on ghc 8.8
- tasty-hspec == 1.1.6 # 2022-04-07: Needed for elm-format
- vty == 5.35.1 # 2022-07-08: needed for glirc-2.39.0.1
- weeder == 2.2.* # 2022-02-21: preserve for GHC 8.10.7

139
pkgs/development/haskell-modules/hackage-packages.nix generated
View file

@ -104350,30 +104350,35 @@ self: {
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
, path, path-io, syb, text
"fourmolu_0_9_0_0" = callPackage
({ mkDerivation, aeson, ansi-terminal, array, base, bytestring
, Cabal, containers, Diff, directory, dlist, exceptions, filepath
, ghc-lib-parser, gitrev, hspec, hspec-discover, hspec-megaparsec
, megaparsec, MemoTrie, mtl, optparse-applicative, path, path-io
, pretty, process, QuickCheck, syb, template-haskell, temporary
, text, th-lift-instances, yaml
}:
mkDerivation {
pname = "fourmolu";
version = "0.3.0.0";
sha256 = "0v89dvcr8l0swj23kkakc39q6lyxjz90rqgwy7m6a5p6iv3h2wms";
revision = "2";
editedCabalFile = "16ky7wzmnwhzkk18r63ynq78vlrg065z6mp3hqgs92khpjr33g1l";
version = "0.9.0.0";
sha256 = "0zq9fv5yszm7icirgwj8g4lhg21lg87fhz56sssjnfikzmkwyh1l";
revision = "1";
editedCabalFile = "0hbjn9qzbr7a9571isi4i651gdi60qqa40idpfg87qlg2sd61485";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson base bytestring containers directory dlist exceptions
filepath ghc-lib-parser HsYAML HsYAML-aeson mtl syb text
aeson ansi-terminal array base bytestring Cabal containers Diff
directory dlist exceptions filepath ghc-lib-parser megaparsec
MemoTrie mtl syb template-haskell text th-lift-instances yaml
];
executableHaskellDepends = [
base directory ghc-lib-parser gitrev optparse-applicative text
base containers directory filepath ghc-lib-parser gitrev
optparse-applicative text yaml
];
testHaskellDepends = [
base containers filepath hspec path path-io text
base containers Diff directory filepath ghc-lib-parser hspec
hspec-megaparsec megaparsec path path-io pretty process QuickCheck
temporary text
];
testToolDepends = [ hspec-discover ];
description = "A formatter for Haskell source code";
@ -195460,6 +195465,28 @@ self: {
license = lib.licenses.mit;
}) {};
"mod_0_1_2_2" = callPackage
({ mkDerivation, base, deepseq, integer-gmp, primitive
, quickcheck-classes, quickcheck-classes-base, semirings, tasty
, tasty-bench, tasty-quickcheck, vector
}:
mkDerivation {
pname = "mod";
version = "0.1.2.2";
sha256 = "0m92yd323kjjwnphqlima2aj0hh7i1gnpblc8a29ks25gj0sv66v";
libraryHaskellDepends = [
base deepseq integer-gmp primitive semirings vector
];
testHaskellDepends = [
base primitive quickcheck-classes quickcheck-classes-base semirings
tasty tasty-quickcheck vector
];
benchmarkHaskellDepends = [ base tasty-bench ];
description = "Fast type-safe modular arithmetic";
license = lib.licenses.mit;
hydraPlatforms = lib.platforms.none;
}) {};
"mod" = callPackage
({ mkDerivation, base, containers, deepseq, ghc-bignum, primitive
, quickcheck-classes, quickcheck-classes-base, semirings, tasty
@ -214714,59 +214741,32 @@ self: {
broken = true;
}) {};
"ormolu_0_1_4_1" = callPackage
({ mkDerivation, ansi-terminal, base, bytestring, containers, Diff
, dlist, exceptions, filepath, ghc-lib-parser, gitrev, hspec
, hspec-discover, mtl, optparse-applicative, path, path-io, syb
, text
"ormolu_0_5_0_1" = callPackage
({ mkDerivation, aeson, ansi-terminal, array, base, bytestring
, Cabal, containers, Diff, directory, dlist, exceptions, filepath
, ghc-lib-parser, gitrev, hspec, hspec-discover, hspec-megaparsec
, megaparsec, MemoTrie, mtl, optparse-applicative, path, path-io
, QuickCheck, syb, template-haskell, temporary, text
, th-lift-instances
}:
mkDerivation {
pname = "ormolu";
version = "0.1.4.1";
sha256 = "1aamgzimjn9h7kwby9ajfgbj5dx08nmxyalwvpg9rs4xd8pbpd9s";
revision = "1";
editedCabalFile = "1fi8fxyhw9jdwhsbmrikjqd461wrz7h4kdszrahlvdjfdsn4wh7d";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
ansi-terminal base bytestring containers Diff dlist exceptions
ghc-lib-parser mtl syb text
];
executableHaskellDepends = [
base filepath 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;
hydraPlatforms = lib.platforms.none;
mainProgram = "ormolu";
}) {};
"ormolu_0_2_0_0" = callPackage
({ mkDerivation, ansi-terminal, base, bytestring, containers, Diff
, dlist, exceptions, filepath, ghc-lib-parser, gitrev, hspec
, hspec-discover, mtl, optparse-applicative, path, path-io, syb
, text
}:
mkDerivation {
pname = "ormolu";
version = "0.2.0.0";
sha256 = "0zivz7vcl4m1rjay5md6cdqac9cnfwz9c844l20byiz5h49bwfhb";
version = "0.5.0.1";
sha256 = "1rnf4x352k856avfllk4rc9v0wwkydr030cmp7j29p0y9cwf5pkg";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
ansi-terminal base bytestring containers Diff dlist exceptions
ghc-lib-parser mtl syb text
aeson ansi-terminal array base bytestring Cabal containers Diff
directory dlist exceptions filepath ghc-lib-parser megaparsec
MemoTrie mtl syb template-haskell text th-lift-instances
];
executableHaskellDepends = [
base filepath ghc-lib-parser gitrev optparse-applicative text
base containers filepath ghc-lib-parser gitrev optparse-applicative
text
];
testHaskellDepends = [
base containers filepath hspec path path-io text
base containers directory filepath ghc-lib-parser hspec
hspec-megaparsec megaparsec path path-io QuickCheck temporary text
];
testToolDepends = [ hspec-discover ];
description = "A formatter for Haskell source code";
@ -279612,31 +279612,34 @@ self: {
broken = true;
}) {};
"stylish-haskell_0_13_0_0" = callPackage
"stylish-haskell_0_14_3_0" = callPackage
({ mkDerivation, aeson, base, bytestring, Cabal, containers
, directory, file-embed, filepath, ghc-lib-parser, HsYAML
, HsYAML-aeson, HUnit, mtl, optparse-applicative, random, strict
, syb, test-framework, test-framework-hunit, text
, directory, file-embed, filepath, ghc, ghc-boot, ghc-boot-th
, ghc-lib-parser-ex, HsYAML, HsYAML-aeson, HUnit, mtl
, optparse-applicative, random, regex-tdfa, strict, syb
, test-framework, test-framework-hunit, text
}:
mkDerivation {
pname = "stylish-haskell";
version = "0.13.0.0";
sha256 = "0x9w3zh1lzp6l5xj3mynnlr0fzb5mbv0wwpfxp8fr6bk0jcrzjwf";
version = "0.14.3.0";
sha256 = "17w92v0qnwj7m6yqdq5cxbr04xiz0yfnnyx5q54218wdl7n5lf6d";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson base bytestring Cabal containers directory file-embed
filepath ghc-lib-parser HsYAML HsYAML-aeson mtl syb text
filepath ghc ghc-boot ghc-boot-th ghc-lib-parser-ex HsYAML
HsYAML-aeson mtl regex-tdfa syb text
];
executableHaskellDepends = [
aeson base bytestring Cabal containers directory file-embed
filepath ghc-lib-parser HsYAML HsYAML-aeson mtl
optparse-applicative strict syb
filepath ghc ghc-boot ghc-boot-th ghc-lib-parser-ex HsYAML
HsYAML-aeson mtl optparse-applicative regex-tdfa strict syb text
];
testHaskellDepends = [
aeson base bytestring Cabal containers directory file-embed
filepath ghc-lib-parser HsYAML HsYAML-aeson HUnit mtl random syb
test-framework test-framework-hunit text
filepath ghc ghc-boot ghc-boot-th ghc-lib-parser-ex HsYAML
HsYAML-aeson HUnit mtl random regex-tdfa syb test-framework
test-framework-hunit text
];
description = "Haskell code prettifier";
license = lib.licenses.bsd3;