Skip to content

Commit 1c8504a

Browse files
committed
Fix various cabal issues
1 parent c00eca0 commit 1c8504a

File tree

2 files changed

+15
-18
lines changed

2 files changed

+15
-18
lines changed

plugins/hls-cabal-plugin/hls-cabal-plugin.cabal

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ maintainer: fendor@posteo.de
1313
category: Development
1414
extra-source-files:
1515
CHANGELOG.md
16+
test/testdata/invalid.cabal
17+
test/testdata/licenseCodeAction.cabal
1618
test/testdata/simple.cabal
1719

1820
common warnings
@@ -27,27 +29,21 @@ library
2729
Ide.Plugin.Cabal.Parse
2830

2931
build-depends:
30-
, aeson
31-
, base >=4.12 && <5
32+
, base >=4.12 && <5
3233
, bytestring
33-
, Cabal
34-
, czipwith
34+
, Cabal ^>= 3.6.3.0 || ^>= 3.4.1.0 || ^>= 3.2
3535
, deepseq
3636
, directory
37-
, extra
38-
, filepath
39-
, ghc-exactprint
40-
, ghcide >=1.6 && <1.8
37+
, extra >=1.7.4
38+
, ghcide ^>=1.7
4139
, hashable
42-
, hls-plugin-api >=1.3 && <1.5
43-
, lens
44-
, lsp
45-
, lsp-types
46-
, regex-tdfa
40+
, hls-plugin-api ^>=1.4
41+
, lsp ^>=1.4.0.0
42+
, lsp-types ^>=1.4.0.1
43+
, regex-tdfa ^>=1.3.1
4744
, stm
48-
, text
49-
, transformers
50-
, unordered-containers
45+
, text ^>=1.2.4.0
46+
, unordered-containers >=0.2.10.0
5147

5248
hs-source-dirs: src
5349
default-language: Haskell2010
@@ -61,11 +57,10 @@ test-suite tests
6157
build-depends:
6258
, base
6359
, filepath
60+
, ghcide
6461
, hls-cabal-plugin
6562
, hls-test-utils ^>=1.3
6663
, lens
67-
, lsp
68-
, ghcide
6964
, lsp-types
7065
, tasty-hunit
7166
, text

stack-lts16.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ extra-deps:
4141
- apply-refact-0.9.3.0
4242
- brittany-0.13.1.2
4343
- bytestring-trie-0.2.5.0
44+
- Cabal-3.2.1.0
4445
- cabal-plan-0.6.2.0
4546
- clock-0.7.2
4647
- constrained-dynamic-0.1.0.0
@@ -63,6 +64,7 @@ extra-deps:
6364
- ilist-0.3.1.0
6465
- implicit-hie-cradle-0.3.0.5
6566
- implicit-hie-0.1.2.6
67+
- lens-4.19
6668
- megaparsec-9.0.1
6769
- monad-dijkstra-0.1.1.2
6870
- opentelemetry-0.6.1

0 commit comments

Comments
 (0)