Skip to content

Commit b4db132

Browse files
committed
Remove dependency on Cabal
Cabal as a dependency is a pretty hefty price to pay for simply getting the build architecture, which already seems to be in System.Info. Probably just accidentally copied over from when HIE used Cabal for dealing with .cabal files
1 parent 7ad18cf commit b4db132

6 files changed

+2
-8
lines changed

haskell-language-server.cabal

-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ library
6262
, aeson
6363
, binary
6464
, bytestring
65-
, Cabal
6665
, cabal-helper >= 1.1
6766
, containers
6867
, data-default

src/Ide/Version.hs

+1-3
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ module Ide.Version where
77

88
import Data.Maybe
99
import Development.GitRev (gitCommitCount)
10-
import Distribution.System (buildArch)
11-
import Distribution.Text (display)
1210
import Options.Applicative.Simple (simpleVersion)
1311
import Ide.Cradle (execProjectGhc)
1412
import qualified HIE.Bios.Types as Bios
@@ -26,7 +24,7 @@ hlsVersion =
2624
-- See https://github.com/commercialhaskell/stack/issues/792
2725
, [" (" ++ commitCount ++ " commits)" | commitCount /= ("1"::String) &&
2826
commitCount /= ("UNKNOWN" :: String)]
29-
, [" ", display buildArch]
27+
, [" ", arch]
3028
, [" ", hlsGhcDisplayVersion]
3129
]
3230

stack-8.10.1.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ packages:
55
- ./ghcide/
66

77
extra-deps:
8-
- Cabal-3.0.2.0
98
# - cabal-helper-1.1.0.0
109
- github: DanielG/cabal-helper
1110
commit: 79a5608778493bf32e74b54bbf1ea2729941e50f
11+
- Cabal-3.0.2.0
1212
- cabal-plan-0.7.0.0
1313
- clock-0.7.2
1414
- floskell-0.10.3

stack-8.6.4.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ extra-deps:
99
- brittany-0.12.1.1
1010
- butcher-1.3.3.1
1111
- bytestring-trie-0.2.5.0
12-
- Cabal-3.0.2.0
1312
- cabal-doctest-1.0.8
1413
- cabal-helper-1.1.0.0
1514
- cabal-plan-0.5.0.0

stack-8.6.5.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ extra-deps:
99
- base-compat-0.11.0
1010
- brittany-0.12.1.1@rev:2
1111
- butcher-1.3.3.1
12-
- Cabal-3.0.2.0
1312
- cabal-helper-1.1.0.0
1413
- cabal-plan-0.6.2.0
1514
- clock-0.7.2

stack.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ extra-deps:
99
- base-compat-0.11.0
1010
- brittany-0.12.1.1@rev:2
1111
- butcher-1.3.3.1
12-
- Cabal-3.0.2.0
1312
- cabal-helper-1.1.0.0
1413
- cabal-plan-0.6.2.0
1514
- clock-0.7.2

0 commit comments

Comments
 (0)