Rename hls in actual cabal project file

haskell · Jan 24, 2022 · 59c26f1 · 59c26f1
1 parent cc330d9
commit 59c26f1
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh
@@ -53,7 +53,7 @@ fi
 # Shorten binary names
 sed -i.bak -e 's/haskell-language-server/hls/g' \
 	   -e 's/haskell_language_server/hls/g' \
-	   haskell-language-server.cabal cabal.project
+	   haskell-language-server.cabal $CABAL_PROJECT
 sed -i.bak -e 's/Paths_haskell_language_server/Paths_hls/g' \
 	   src/**/*.hs exe/*.hs
 

diff --git a/cabal-ghc921.project b/cabal-ghc921.project
@@ -42,7 +42,7 @@ index-state: 2022-01-21T11:23:29Z
 
 constraints:
   -- These plugins don't build/work on GHC92 yet
-  haskell-language-server
+  hls
     +ignore-plugins-ghc-bounds
     -alternateNumberFormat
     -brittany

diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal
@@ -1,13 +1,13 @@
 cabal-version:      2.4
 category:           Development
-name:               haskell-language-server
+name:               hls
 version:            1.5.1.0
 synopsis:           LSP server for GHC
 description:
-  Please see the README on GitHub at <https://github.com/haskell/haskell-language-server#readme>
+  Please see the README on GitHub at <https://github.com/haskell/hls#readme>
 
-homepage:           https://github.com/haskell/haskell-language-server#readme
-bug-reports:        https://github.com/haskell/haskell-language-server/issues
+homepage:           https://github.com/haskell/hls#readme
+bug-reports:        https://github.com/haskell/hls/issues
 author:             The Haskell IDE Team
 maintainer:         alan.zimm@gmail.com
 copyright:          The Haskell IDE Team
@@ -30,7 +30,7 @@ flag pedantic
 
 source-repository head
   type:     git
-  location: https://github.com/haskell/haskell-language-server
+  location: https://github.com/haskell/hls
 
 common common-deps
   build-depends:
@@ -59,8 +59,8 @@ library
     Ide.Main
     Ide.Version
 
-  other-modules:    Paths_haskell_language_server
-  autogen-modules:  Paths_haskell_language_server
+  other-modules:    Paths_hls
+  autogen-modules:  Paths_hls
   hs-source-dirs:   src
   build-depends:
     , async
@@ -89,7 +89,7 @@ library
   default-language: Haskell2010
   default-extensions: DataKinds, TypeOperators
 
--- Plugin flags are designed for 'cabal install haskell-language-server':
+-- Plugin flags are designed for 'cabal install hls':
 -- - Bulk flags should be default:False
 -- - Individual flags should be default:True
 
@@ -320,7 +320,7 @@ common brittany
     build-depends: hls-brittany-plugin ^>=1.0.0.1
     cpp-options: -Dbrittany
 
-executable haskell-language-server
+executable hls
   import:             common-deps
                     -- configuration
                     , warnings
@@ -378,7 +378,7 @@ executable haskell-language-server
     , ghc-boot-th
     , ghcide
     , hashable
-    , haskell-language-server
+    , hls
     , lsp
     , hie-bios
     , hiedb
@@ -401,14 +401,14 @@ executable haskell-language-server
   default-language: Haskell2010
   default-extensions: DataKinds, TypeOperators
 
-executable haskell-language-server-wrapper
+executable hls-wrapper
   import:           common-deps
                   , warnings
                   , pedantic
   main-is:          Wrapper.hs
   hs-source-dirs:   exe
-  other-modules:    Paths_haskell_language_server
-  autogen-modules:  Paths_haskell_language_server
+  other-modules:    Paths_hls
+  autogen-modules:  Paths_hls
   ghc-options:
     -threaded
     -- allow user RTS overrides
@@ -423,7 +423,7 @@ executable haskell-language-server-wrapper
     , ghc-paths
     , ghcide
     , gitrev
-    , haskell-language-server
+    , hls
     , hie-bios
     , optparse-applicative
     , optparse-simple
@@ -439,7 +439,7 @@ test-suite func-test
   type:               exitcode-stdio-1.0
   default-language:   Haskell2010
   build-tool-depends:
-    haskell-language-server:haskell-language-server -any,
+    hls:hls -any,
     ghcide:ghcide-test-preprocessor -any
 
   build-depends:
@@ -500,8 +500,8 @@ test-suite wrapper-test
                     , pedantic
   type:               exitcode-stdio-1.0
   build-tool-depends:
-    haskell-language-server:haskell-language-server-wrapper -any,
-    haskell-language-server:haskell-language-server -any
+    hls:hls-wrapper -any,
+    hls:hls -any
 
   default-language:   Haskell2010
   build-depends: