From 993b59c13ae2537ffd28cca57a7c6a83b560af1d Mon Sep 17 00:00:00 2001 From: Luke Lau Date: Mon, 13 Jul 2020 10:58:04 +0100 Subject: [PATCH] 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 --- haskell-language-server.cabal | 1 - src/Ide/Version.hs | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal index 4126741f3d..7b8ba8953d 100644 --- a/haskell-language-server.cabal +++ b/haskell-language-server.cabal @@ -62,7 +62,6 @@ library , aeson , binary , bytestring - , Cabal , cabal-helper >= 1.1 , containers , data-default diff --git a/src/Ide/Version.hs b/src/Ide/Version.hs index 2baccfd501..fe6908e973 100644 --- a/src/Ide/Version.hs +++ b/src/Ide/Version.hs @@ -7,8 +7,6 @@ module Ide.Version where import Data.Maybe import Development.GitRev (gitCommitCount) -import Distribution.System (buildArch) -import Distribution.Text (display) import Options.Applicative.Simple (simpleVersion) import Ide.Cradle (execProjectGhc) import qualified HIE.Bios.Types as Bios @@ -26,7 +24,7 @@ hlsVersion = -- See https://github.com/commercialhaskell/stack/issues/792 , [" (" ++ commitCount ++ " commits)" | commitCount /= ("1"::String) && commitCount /= ("UNKNOWN" :: String)] - , [" ", display buildArch] + , [" ", arch] , [" ", hlsGhcDisplayVersion] ]