Skip to content

Commit bbc365e

Browse files
July541July541
committed
Merge remote-tracking branch 'origin' into stale-class-lens
2 parents 6f4c1e4 + 1d07fbe commit bbc365e

File tree

38 files changed

+134
-86
lines changed

38 files changed

+134
-86
lines changed

‎.cirrus.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ build_task:
3333
- name: build-ghc-9.2.7
3434
env:
3535
GHC_VERSION: 9.2.7
36-
install_script: pkg install -y hs-cabal-install git bash misc/compat10x misc/compat11x misc/compat12x gmake patchelf tree
36+
install_script: pkg install -y hs-cabal-install git bash misc/compat10x misc/compat11x misc/compat12x gmake patchelf tree gmp libiconv
3737
script:
3838
- tzsetup Etc/GMT
3939
- adjkerntz -a
@@ -59,7 +59,7 @@ bindist_task:
5959
DISTRO: "na"
6060
RUNNER_OS: "FreeBSD"
6161
GITHUB_WORKSPACE: ${CIRRUS_WORKING_DIR}
62-
install_script: pkg install -y hs-cabal-install git bash misc/compat10x misc/compat11x misc/compat12x gmake patchelf tree unzip
62+
install_script: pkg install -y hs-cabal-install git bash misc/compat10x misc/compat11x misc/compat12x gmake patchelf tree gmp libiconv unzip
6363
script:
6464
- tzsetup Etc/GMT
6565
- adjkerntz -a
@@ -97,7 +97,7 @@ test_task:
9797
DISTRO: "na"
9898
RUNNER_OS: "FreeBSD"
9999
GITHUB_WORKSPACE: ${CIRRUS_WORKING_DIR}
100-
install_script: pkg install -y hs-cabal-install git bash misc/compat10x misc/compat11x misc/compat12x gmake patchelf tree unzip
100+
install_script: pkg install -y hs-cabal-install git bash misc/compat10x misc/compat11x misc/compat12x gmake patchelf tree gmp libiconv unzip
101101
script:
102102
- tzsetup Etc/GMT
103103
- adjkerntz -a

‎.github/scripts/build.sh

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@ pwd
1212
env
1313

1414
# ensure ghcup
15-
if ! command -v ghcup ; then
16-
install_ghcup
17-
fi
15+
install_ghcup
1816

1917
# ensure cabal-cache
2018
download_cabal_cache "$HOME/.local/bin/cabal-cache"
2119

2220

2321
# build
24-
ecabal update
2522
ghcup install ghc "${GHC_VERSION}"
2623
ghcup set ghc "${GHC_VERSION}"
24+
(cd .. && ecabal update) # run cabal update outside project dir
25+
ecabal user-config diff
26+
ecabal user-config init -f
2727
"ghc-${GHC_VERSION}" --info
2828
"ghc" --info
2929

@@ -32,6 +32,10 @@ mkdir -p "$CI_PROJECT_DIR/out/plan.json"
3232

3333
case "$(uname)" in
3434
MSYS_*|MINGW*)
35+
# cat "C:\Users\runneradmin\AppData\Roaming\cabal\config"
36+
# sed -ic "/extra-include-dirs/d" "C:\Users\runneradmin\AppData\Roaming\cabal\config"
37+
# sed -ic "/extra-lib-dirs/d" "C:\Users\runneradmin\AppData\Roaming\cabal\config"
38+
cat "C:\Users\runneradmin\AppData\Roaming\cabal\config"
3539
args=( -O2 -w "ghc-$GHC_VERSION" --project-file cabal.project --disable-profiling --disable-tests --enable-executable-stripping ${ADD_CABAL_ARGS})
3640

3741
# Shorten binary names

‎.github/scripts/common.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ build_with_cache() {
126126
}
127127

128128
install_ghcup() {
129-
find "$GHCUP_INSTALL_BASE_PREFIX"
129+
# find "$GHCUP_INSTALL_BASE_PREFIX"
130130
mkdir -p "$GHCUP_BIN"
131131
mkdir -p "$GHCUP_BIN"/../cache
132132

‎.github/scripts/env.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ fi
1111
export PATH="$HOME/.local/bin:$PATH"
1212

1313
export BOOTSTRAP_HASKELL_NONINTERACTIVE=1
14-
export BOOTSTRAP_HASKELL_CABAL_VERSION="${CABAL_VER:-recommended}"
15-
export BOOTSTRAP_HASKELL_ADJUST_CABAL_CONFIG=yes
14+
export BOOTSTRAP_HASKELL_CABAL_VERSION="${CABAL_VER:-3.8.1.0}"
15+
export BOOTSTRAP_HASKELL_ADJUST_CABAL_CONFIG=no
1616
export BOOTSTRAP_HASKELL_INSTALL_NO_STACK=yes
1717

1818
if [ "${RUNNER_OS}" = "Windows" ] ; then

‎.github/scripts/test.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,10 @@ uname
5353
env
5454

5555
# ensure ghcup
56-
if ! command -v ghcup ; then
57-
install_ghcup
58-
fi
56+
install_ghcup
57+
ghcup install ghc --set 9.4.4
5958

60-
ecabal update
59+
(cd .. && ecabal update) # run cabal update outside project dir
6160

6261
# unpack
6362
TARBALL_PREFIX="haskell-language-server"

‎.github/workflows/release.yaml

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
strategy:
2626
fail-fast: false
2727
matrix:
28-
ghc: ["9.4.4", "9.2.7", "9.2.5", "9.0.2", "8.10.7"]
28+
ghc: ["9.6.1", "9.4.4", "9.2.7", "9.0.2", "8.10.7"]
2929
platform: [ { image: "debian:9"
3030
, installCmd: "apt-get update && apt-get install -y"
3131
, toolRequirements: "libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev git wget lsb-release software-properties-common gnupg2 apt-transport-https gcc autoconf automake build-essential curl ghc gzip libffi-dev libncurses-dev libncurses5 libtinfo5 patchelf"
@@ -111,12 +111,12 @@ jobs:
111111
platform: { image: "rockylinux:8", installCmd: "yum -y install epel-release && yum install -y --allowerasing", toolRequirements: "autoconf automake binutils bzip2 coreutils curl elfutils-devel elfutils-libs findutils gcc gcc-c++ git gmp gmp-devel jq lbzip2 make ncurses ncurses-compat-libs ncurses-devel openssh-clients patch perl pxz python3 sqlite sudo wget which xz zlib-devel patchelf", DISTRO: "Unknown", ARTIFACT: "x86_64-linux-unknown", ADD_CABAL_ARGS: "--enable-split-sections" }
112112
- ghc: 9.0.2
113113
platform: { image: "rockylinux:8", installCmd: "yum -y install epel-release && yum install -y --allowerasing", toolRequirements: "autoconf automake binutils bzip2 coreutils curl elfutils-devel elfutils-libs findutils gcc gcc-c++ git gmp gmp-devel jq lbzip2 make ncurses ncurses-compat-libs ncurses-devel openssh-clients patch perl pxz python3 sqlite sudo wget which xz zlib-devel patchelf", DISTRO: "Unknown", ARTIFACT: "x86_64-linux-unknown", ADD_CABAL_ARGS: "--enable-split-sections" }
114-
- ghc: 9.2.5
115-
platform: { image: "rockylinux:8", installCmd: "yum -y install epel-release && yum install -y --allowerasing", toolRequirements: "autoconf automake binutils bzip2 coreutils curl elfutils-devel elfutils-libs findutils gcc gcc-c++ git gmp gmp-devel jq lbzip2 make ncurses ncurses-compat-libs ncurses-devel openssh-clients patch perl pxz python3 sqlite sudo wget which xz zlib-devel patchelf", DISTRO: "Unknown", ARTIFACT: "x86_64-linux-unknown", ADD_CABAL_ARGS: "--enable-split-sections" }
116114
- ghc: 9.2.7
117115
platform: { image: "rockylinux:8", installCmd: "yum -y install epel-release && yum install -y --allowerasing", toolRequirements: "autoconf automake binutils bzip2 coreutils curl elfutils-devel elfutils-libs findutils gcc gcc-c++ git gmp gmp-devel jq lbzip2 make ncurses ncurses-compat-libs ncurses-devel openssh-clients patch perl pxz python3 sqlite sudo wget which xz zlib-devel patchelf", DISTRO: "Unknown", ARTIFACT: "x86_64-linux-unknown", ADD_CABAL_ARGS: "--enable-split-sections" }
118116
- ghc: 9.4.4
119117
platform: { image: "fedora:33", installCmd: "dnf install -y", toolRequirements: "autoconf automake binutils bzip2 coreutils curl elfutils-devel elfutils-libs findutils gcc gcc-c++ git gmp gmp-devel jq lbzip2 make ncurses ncurses-compat-libs ncurses-devel openssh-clients patch perl pxz python3 sqlite sudo wget which xz zlib-devel patchelf tree", DISTRO: "Unknown", ARTIFACT: "x86_64-linux-unknown", ADD_CABAL_ARGS: "--enable-split-sections" }
118+
- ghc: 9.6.1
119+
platform: { image: "rockylinux:8", installCmd: "yum -y install epel-release && yum install -y --allowerasing", toolRequirements: "autoconf automake binutils bzip2 coreutils curl elfutils-devel elfutils-libs findutils gcc gcc-c++ git gmp gmp-devel jq lbzip2 make ncurses ncurses-compat-libs ncurses-devel openssh-clients patch perl pxz python3 sqlite sudo wget which xz zlib-devel patchelf", DISTRO: "Unknown", ARTIFACT: "x86_64-linux-unknown", ADD_CABAL_ARGS: "--enable-split-sections" }
120120
container:
121121
image: ${{ matrix.platform.image }}
122122
steps:
@@ -171,7 +171,7 @@ jobs:
171171
strategy:
172172
fail-fast: true
173173
matrix:
174-
ghc: ["9.4.4", "9.2.7", "9.2.5", "9.0.2", "8.10.7"]
174+
ghc: ["9.6.1","9.4.4", "9.2.7", "9.0.2", "8.10.7"]
175175
steps:
176176
- uses: docker://arm64v8/ubuntu:focal
177177
name: Cleanup (aarch64 linux)
@@ -226,7 +226,7 @@ jobs:
226226
strategy:
227227
fail-fast: false
228228
matrix:
229-
ghc: ["9.4.4", "9.2.7", "9.2.5", "9.0.2", "8.10.7"]
229+
ghc: ["9.6.1", "9.4.4", "9.2.7", "9.0.2", "8.10.7"]
230230
steps:
231231
- name: Checkout code
232232
uses: actions/checkout@v3
@@ -266,20 +266,25 @@ jobs:
266266
strategy:
267267
fail-fast: false
268268
matrix:
269-
ghc: ["9.4.4", "9.2.7", "9.2.5", "8.10.7"]
269+
ghc: ["9.6.1", "9.4.4", "9.2.7", "8.10.7"]
270270
steps:
271271
- name: Checkout code
272272
uses: actions/checkout@v3
273273

274274
- name: Run build
275275
run: |
276-
bash .github/scripts/brew.sh git coreutils llvm@11 autoconf automake tree
277-
export PATH="$HOME/.brew/bin:$HOME/.brew/sbin:$HOME/.brew/opt/llvm@11/bin:$PATH"
278-
export CC="$HOME/.brew/opt/llvm@11/bin/clang"
279-
export CXX="$HOME/.brew/opt/llvm@11/bin/clang++"
276+
if test "${GHC_VERSION}" = "8.10.7"; then
277+
bash .github/scripts/brew.sh git coreutils llvm@11 autoconf automake tree
278+
export PATH="$HOME/.brew/bin:$HOME/.brew/sbin:$HOME/.brew/opt/llvm@11/bin:$PATH"
279+
export CC="$HOME/.brew/opt/llvm@11/bin/clang"
280+
export CXX="$HOME/.brew/opt/llvm@11/bin/clang++"
281+
export AR="$HOME/.brew/opt/llvm@11/bin/llvm-ar"
282+
export RANLIB="$HOME/.brew/opt/llvm@11/bin/llvm-ranlib"
283+
else
284+
bash .github/scripts/brew.sh git coreutils autoconf automake tree
285+
export PATH="$HOME/.brew/bin:$HOME/.brew/sbin:$PATH"
286+
fi
280287
export LD=ld
281-
export AR="$HOME/.brew/opt/llvm@11/bin/llvm-ar"
282-
export RANLIB="$HOME/.brew/opt/llvm@11/bin/llvm-ranlib"
283288
bash .github/scripts/build.sh
284289
tar cf out-${ARTIFACT}-${GHC_VERSION}.tar out/ store/
285290
env:
@@ -310,7 +315,7 @@ jobs:
310315
strategy:
311316
fail-fast: false
312317
matrix:
313-
ghc: ["9.4.4", "9.2.7", "9.2.5", "9.0.2", "8.10.7"]
318+
ghc: ["9.6.1", "9.4.4", "9.2.7", "9.0.2", "8.10.7"]
314319
steps:
315320
- name: install windows deps
316321
shell: pwsh

‎ChangeLog.md

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,54 @@
11
# Changelog for haskell-language-server
22

3+
## 1.10.0.0
4+
5+
- Support for GHC 9.6
6+
- Binaries for GHC 9.2.7 and GHC 9.6.1
7+
- Eval plugin support for GHC 9.4+ (#3391)
8+
- Don't show lenses for TH generated instances when using hls-class-plugin (#3531)
9+
10+
### Pull requests merged for 1.10.0.0
11+
- Support fourmolu 0.11
12+
([#3533](https://github.com/haskell/haskell-language-server/pull/3533)) by @brandonchinn178
13+
- Don't show lenses for TH generated instances
14+
([#3531](https://github.com/haskell/haskell-language-server/pull/3531)) by @July541
15+
- Bump haskell/actions from 2.3.3 to 2.3.6
16+
([#3529](https://github.com/haskell/haskell-language-server/pull/3529)) by @dependabot[bot]
17+
- Use GHC 9.2.7 in flake
18+
([#3527](https://github.com/haskell/haskell-language-server/pull/3527)) by @cydparser
19+
- Remove HsLogger
20+
([#3526](https://github.com/haskell/haskell-language-server/pull/3526)) by @fendor
21+
- Use hie-bios 0.12
22+
([#3524](https://github.com/haskell/haskell-language-server/pull/3524)) by @wz1000
23+
- Bump haskell/actions
24+
([#3520](https://github.com/haskell/haskell-language-server/pull/3520)) by @michaelpj
25+
- Bump cachix/install-nix-action from 19 to 20
26+
([#3514](https://github.com/haskell/haskell-language-server/pull/3514)) by @dependabot[bot]
27+
- Docs: update Emacs section: add eglot with config example
28+
([#3509](https://github.com/haskell/haskell-language-server/pull/3509)) by @m4lvin
29+
- Eval plugin is now supported in 9.4
30+
([#3508](https://github.com/haskell/haskell-language-server/pull/3508)) by @michaelpj
31+
- Update flake to GHC 9.2.6 and 9.4.4
32+
([#3503](https://github.com/haskell/haskell-language-server/pull/3503)) by @cydparser
33+
- Fix lower ghcide bounds of rename and fourmolu plugins
34+
([#3501](https://github.com/haskell/haskell-language-server/pull/3501)) by @pepeiborra
35+
- Add 9.2.6 to ghc-version-support.md
36+
([#3494](https://github.com/haskell/haskell-language-server/pull/3494)) by @wz1000
37+
- Bump versions and add changelogs for 1.9.1.0
38+
([#3493](https://github.com/haskell/haskell-language-server/pull/3493)) by @hasufell
39+
- Bump cachix/install-nix-action from 18 to 19
40+
([#3490](https://github.com/haskell/haskell-language-server/pull/3490)) by @dependabot[bot]
41+
- Experiment with loading matrix values from a file
42+
([#3481](https://github.com/haskell/haskell-language-server/pull/3481)) by @michaelpj
43+
- 9.6 support for HLS
44+
([#3480](https://github.com/haskell/haskell-language-server/pull/3480)) by @wz1000
45+
- Make the Ormolu plugin respect `.ormolu` fixity files when Ormolu ≥0.5.3.0
46+
([#3449](https://github.com/haskell/haskell-language-server/pull/3449)) by @amesgen
47+
- Migrate release CI to github
48+
([#3406](https://github.com/haskell/haskell-language-server/pull/3406)) by @hasufell
49+
- Eval plugin for GHC 9.4
50+
([#3391](https://github.com/haskell/haskell-language-server/pull/3391)) by @wz1000
51+
352
## 1.9.1.0
453

554
- Binaries for GHC 9.2.6.

‎cabal.project

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,13 @@ tests: True
4949
package mfsolve
5050
tests: False
5151

52-
if impl(ghc >= 9.5)
53-
source-repository-package
54-
type:git
55-
location: https://github.com/wz1000/retrie
56-
tag: 0a2dbfc00e745737f249f16325b2815d2e3a14eb
57-
5852
package *
5953
ghc-options: -haddock
6054
test-show-details: direct
6155

6256
write-ghc-environment-files: never
6357

64-
index-state: 2023-03-23T00:00:00Z
58+
index-state: 2023-03-30T00:00:00Z
6559

6660
constraints:
6761
-- For GHC 9.4, older versions of entropy fail to build on Windows
@@ -81,6 +75,8 @@ constraints:
8175
setup.happy == 1.20.1.1,
8276
happy == 1.20.1.1,
8377
filepath installed,
78+
-- for ghc 8.10, stm-hamt 1.2.0.10 doesn't build
79+
stm-hamt < 1.2.0.10
8480

8581
-- This is benign and won't affect our ability to release to Hackage,
8682
-- because we only depend on `ekg-json` when a non-default flag
@@ -129,11 +125,6 @@ if impl(ghc >= 9.5)
129125
focus:transformers,
130126
ghc-trace-events:base,
131127
implicit-hie-cradle:transformers,
132-
retrie:base,
133-
retrie:ghc,
134-
retrie:ghc-exactprint,
135-
retrie:mtl,
136-
retrie:transformers,
137128
semigroupoids:base,
138129
stm-hamt:transformers,
139130
entropy:Cabal,

‎ghcide/ghcide.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ cabal-version: 3.0
22
build-type: Simple
33
category: Development
44
name: ghcide
5-
version: 1.9.1.0
5+
version: 1.10.0.0
66
license: Apache-2.0
77
license-file: LICENSE
88
author: Digital Asset and Ghcide contributors

‎haskell-language-server.cabal

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cabal-version: 3.0
22
category: Development
33
name: haskell-language-server
4-
version: 1.9.1.0
4+
version: 1.10.0.0
55
synopsis: LSP server for GHC
66
description:
77
Please see the README on GitHub at <https://github.com/haskell/haskell-language-server#readme>
@@ -238,7 +238,7 @@ common haddockComments
238238

239239
common eval
240240
if flag(eval)
241-
build-depends: hls-eval-plugin ^>= 1.4
241+
build-depends: hls-eval-plugin ^>= 1.5
242242
cpp-options: -Dhls_eval
243243

244244
common importLens
@@ -288,7 +288,7 @@ common pragmas
288288

289289
common splice
290290
if flag(splice)
291-
build-depends: hls-splice-plugin ^>=1.0.0.1
291+
build-depends: hls-splice-plugin ^>=1.1
292292
cpp-options: -Dhls_splice
293293

294294
common alternateNumberFormat
@@ -350,7 +350,7 @@ common stylishHaskell
350350

351351
common refactor
352352
if flag(refactor)
353-
build-depends: hls-refactor-plugin ^>= 1.1
353+
build-depends: hls-refactor-plugin ^>= 1.2
354354
cpp-options: -Dhls_refactor
355355

356356
library
@@ -405,7 +405,7 @@ library
405405
, cryptohash-sha1
406406
, data-default
407407
, ghc
408-
, ghcide ==1.9.1.0
408+
, ghcide ==1.10.0.0
409409
, githash >=0.1.6.1
410410
, lsp
411411
, hie-bios

‎hls-test-utils/hls-test-utils.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ library
4141
, directory
4242
, extra
4343
, filepath
44-
, ghcide ^>=1.9
44+
, ghcide ^>=1.9 || ^>= 1.10
4545
, hls-graph
4646
, hls-plugin-api ^>=1.6
4747
, lens

‎plugins/hls-alternate-number-format-plugin/hls-alternate-number-format-plugin.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 2.4
22
name: hls-alternate-number-format-plugin
3-
version: 1.3.0.0
3+
version: 1.3.0.1
44
synopsis: Provide Alternate Number Formats plugin for Haskell Language Server
55
description:
66
Please see the README on GitHub at <https://github.com/haskell/haskell-language-server#readme>
@@ -32,7 +32,7 @@ library
3232
, base >=4.12 && < 5
3333
, containers
3434
, extra
35-
, ghcide ^>= 1.9
35+
, ghcide ^>= 1.10
3636
, ghc-boot-th
3737
, hls-graph
3838
, hls-plugin-api ^>= 1.6

‎plugins/hls-cabal-fmt-plugin/hls-cabal-fmt-plugin.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ library
3333
, base >=4.12 && <5
3434
, directory
3535
, filepath
36-
, ghcide ^>= 1.9
36+
, ghcide ^>= 1.9 || ^>= 1.10
3737
, hls-plugin-api ^>= 1.6
3838
, lens
3939
, lsp-types

‎plugins/hls-cabal-plugin/hls-cabal-plugin.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ library
4848
, deepseq
4949
, directory
5050
, extra >=1.7.4
51-
, ghcide ^>= 1.9
51+
, ghcide ^>= 1.9 || ^>= 1.10
5252
, hashable
5353
, hls-plugin-api ^>=1.6
5454
, hls-graph ^>=1.9

‎plugins/hls-call-hierarchy-plugin/hls-call-hierarchy-plugin.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ library
3333
, base >=4.12 && <5
3434
, containers
3535
, extra
36-
, ghcide ^>= 1.9
36+
, ghcide ^>= 1.9 || ^>= 1.10
3737
, hiedb
3838
, hls-plugin-api ^>= 1.6
3939
, lens

0 commit comments

Comments
 (0)