Skip to content

Commit 59c26f1

Browse files
committed
Rename hls in actual cabal project file
1 parent cc330d9 commit 59c26f1

File tree

3 files changed

+19
-19
lines changed

3 files changed

+19
-19
lines changed

.gitlab/ci.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ fi
5353
# Shorten binary names
5454
sed -i.bak -e 's/haskell-language-server/hls/g' \
5555
-e 's/haskell_language_server/hls/g' \
56-
haskell-language-server.cabal cabal.project
56+
haskell-language-server.cabal $CABAL_PROJECT
5757
sed -i.bak -e 's/Paths_haskell_language_server/Paths_hls/g' \
5858
src/**/*.hs exe/*.hs
5959

cabal-ghc921.project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ index-state: 2022-01-21T11:23:29Z
4242

4343
constraints:
4444
-- These plugins don't build/work on GHC92 yet
45-
haskell-language-server
45+
hls
4646
+ignore-plugins-ghc-bounds
4747
-alternateNumberFormat
4848
-brittany

haskell-language-server.cabal

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
cabal-version: 2.4
22
category: Development
3-
name: haskell-language-server
3+
name: hls
44
version: 1.5.1.0
55
synopsis: LSP server for GHC
66
description:
7-
Please see the README on GitHub at <https://github.com/haskell/haskell-language-server#readme>
7+
Please see the README on GitHub at <https://github.com/haskell/hls#readme>
88

9-
homepage: https://github.com/haskell/haskell-language-server#readme
10-
bug-reports: https://github.com/haskell/haskell-language-server/issues
9+
homepage: https://github.com/haskell/hls#readme
10+
bug-reports: https://github.com/haskell/hls/issues
1111
author: The Haskell IDE Team
1212
maintainer: [email protected]
1313
copyright: The Haskell IDE Team
@@ -30,7 +30,7 @@ flag pedantic
3030

3131
source-repository head
3232
type: git
33-
location: https://github.com/haskell/haskell-language-server
33+
location: https://github.com/haskell/hls
3434

3535
common common-deps
3636
build-depends:
@@ -59,8 +59,8 @@ library
5959
Ide.Main
6060
Ide.Version
6161

62-
other-modules: Paths_haskell_language_server
63-
autogen-modules: Paths_haskell_language_server
62+
other-modules: Paths_hls
63+
autogen-modules: Paths_hls
6464
hs-source-dirs: src
6565
build-depends:
6666
, async
@@ -89,7 +89,7 @@ library
8989
default-language: Haskell2010
9090
default-extensions: DataKinds, TypeOperators
9191

92-
-- Plugin flags are designed for 'cabal install haskell-language-server':
92+
-- Plugin flags are designed for 'cabal install hls':
9393
-- - Bulk flags should be default:False
9494
-- - Individual flags should be default:True
9595

@@ -320,7 +320,7 @@ common brittany
320320
build-depends: hls-brittany-plugin ^>=1.0.0.1
321321
cpp-options: -Dbrittany
322322

323-
executable haskell-language-server
323+
executable hls
324324
import: common-deps
325325
-- configuration
326326
, warnings
@@ -378,7 +378,7 @@ executable haskell-language-server
378378
, ghc-boot-th
379379
, ghcide
380380
, hashable
381-
, haskell-language-server
381+
, hls
382382
, lsp
383383
, hie-bios
384384
, hiedb
@@ -401,14 +401,14 @@ executable haskell-language-server
401401
default-language: Haskell2010
402402
default-extensions: DataKinds, TypeOperators
403403

404-
executable haskell-language-server-wrapper
404+
executable hls-wrapper
405405
import: common-deps
406406
, warnings
407407
, pedantic
408408
main-is: Wrapper.hs
409409
hs-source-dirs: exe
410-
other-modules: Paths_haskell_language_server
411-
autogen-modules: Paths_haskell_language_server
410+
other-modules: Paths_hls
411+
autogen-modules: Paths_hls
412412
ghc-options:
413413
-threaded
414414
-- allow user RTS overrides
@@ -423,7 +423,7 @@ executable haskell-language-server-wrapper
423423
, ghc-paths
424424
, ghcide
425425
, gitrev
426-
, haskell-language-server
426+
, hls
427427
, hie-bios
428428
, optparse-applicative
429429
, optparse-simple
@@ -439,7 +439,7 @@ test-suite func-test
439439
type: exitcode-stdio-1.0
440440
default-language: Haskell2010
441441
build-tool-depends:
442-
haskell-language-server:haskell-language-server -any,
442+
hls:hls -any,
443443
ghcide:ghcide-test-preprocessor -any
444444

445445
build-depends:
@@ -500,8 +500,8 @@ test-suite wrapper-test
500500
, pedantic
501501
type: exitcode-stdio-1.0
502502
build-tool-depends:
503-
haskell-language-server:haskell-language-server-wrapper -any,
504-
haskell-language-server:haskell-language-server -any
503+
hls:hls-wrapper -any,
504+
hls:hls -any
505505

506506
default-language: Haskell2010
507507
build-depends:

0 commit comments

Comments
 (0)