From d0552c8b0078996d5cb9b5760e1d19519b85aeee Mon Sep 17 00:00:00 2001 From: Potato Hatsue <1793913507@qq.com> Date: Sun, 4 Apr 2021 11:28:04 +0800 Subject: [PATCH 1/2] Update shake bounds of install script --- install/hls-install.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/hls-install.cabal b/install/hls-install.cabal index a303c32cff..4889230759 100644 --- a/install/hls-install.cabal +++ b/install/hls-install.cabal @@ -19,7 +19,7 @@ library , Env , Help build-depends: base >= 4.9 && < 5 - , shake >= 0.16.4 && < 0.19 + , shake >=0.17.5 , directory , filepath , extra From b48ae75d62973062c0e52a18e15560a5e95c9567 Mon Sep 17 00:00:00 2001 From: Potato Hatsue <1793913507@qq.com> Date: Sun, 4 Apr 2021 14:34:47 +0800 Subject: [PATCH 2/2] Format hls-install.cabal --- install/hls-install.cabal | 71 +++++++++++++++++++++------------------ 1 file changed, 39 insertions(+), 32 deletions(-) diff --git a/install/hls-install.cabal b/install/hls-install.cabal index 4889230759..356446caa1 100644 --- a/install/hls-install.cabal +++ b/install/hls-install.cabal @@ -1,40 +1,47 @@ -name: hls-install -version: 0.8.0.0 -synopsis: Install the haskell-language-server -license: BSD3 -author: Many, TBD when we release -maintainer: samuel.pilz@posteo.net -copyright: 2019 -build-type: Simple -cabal-version: >=2.0 +name: hls-install +version: 0.8.0.0 +synopsis: Install the haskell-language-server +license: BSD3 +author: Many, TBD when we release +maintainer: samuel.pilz@posteo.net +copyright: 2019 +build-type: Simple +cabal-version: >=2.0 library - hs-source-dirs: src - exposed-modules: HlsInstall - other-modules: BuildSystem - , Stack - , Version - , Cabal - , Print - , Env - , Help - build-depends: base >= 4.9 && < 5 - , shake >=0.17.5 - , directory - , filepath - , extra - , text - default-extensions: LambdaCase - , TupleSections - , RecordWildCards - default-language: Haskell2010 + hs-source-dirs: src + exposed-modules: HlsInstall + other-modules: + BuildSystem + Cabal + Env + Help + Print + Stack + Version + + build-depends: + base >=4.9 && <5 + , directory + , extra + , filepath + , shake >=0.17.5 + , text + + default-extensions: + LambdaCase + RecordWildCards + TupleSections + + default-language: Haskell2010 if flag(run-from-stack) - cpp-options: -DRUN_FROM_STACK + cpp-options: -DRUN_FROM_STACK + else build-depends: cabal-install-parsers flag run-from-stack - description: Inform the application that it is run from stack - default: False - manual: True + description: Inform the application that it is run from stack + default: False + manual: True