Skip to content

Commit 4fed6f9

Browse files
committed
Fix various cabal issues
1 parent 334036f commit 4fed6f9

File tree

2 files changed

+15
-18
lines changed

2 files changed

+15
-18
lines changed

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

+13-18
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ maintainer: [email protected]
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
test/testdata/simple.cabal.golden.txt
1820

@@ -28,27 +30,21 @@ library
2830
Ide.Plugin.Cabal.Parse
2931

3032
build-depends:
31-
, aeson
32-
, base >=4.12 && <5
33+
, base >=4.12 && <5
3334
, bytestring
34-
, Cabal
35-
, czipwith
35+
, Cabal ^>= 3.6.3.0 || ^>= 3.4.1.0 || ^>= 3.2
3636
, deepseq
3737
, directory
38-
, extra
39-
, filepath
40-
, ghc-exactprint
41-
, ghcide >=1.6 && <1.8
38+
, extra >=1.7.4
39+
, ghcide ^>=1.7
4240
, hashable
43-
, hls-plugin-api >=1.3 && <1.5
44-
, lens
45-
, lsp
46-
, lsp-types
47-
, regex-tdfa
41+
, hls-plugin-api ^>=1.4
42+
, lsp ^>=1.4.0.0
43+
, lsp-types ^>=1.4.0.1
44+
, regex-tdfa ^>=1.3.1
4845
, stm
49-
, text
50-
, transformers
51-
, unordered-containers
46+
, text ^>=1.2.4.0
47+
, unordered-containers >=0.2.10.0
5248

5349
hs-source-dirs: src
5450
default-language: Haskell2010
@@ -62,11 +58,10 @@ test-suite tests
6258
build-depends:
6359
, base
6460
, filepath
61+
, ghcide
6562
, hls-cabal-plugin
6663
, hls-test-utils ^>=1.3
6764
, lens
68-
, lsp
69-
, ghcide
7065
, lsp-types
7166
, tasty-hunit
7267
, text

stack-lts16.yaml

+2
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)