From a5e03d9562b04aa285dc6ded1958edad4cc4d249 Mon Sep 17 00:00:00 2001 From: jneira Date: Wed, 23 Dec 2020 21:53:30 +0100 Subject: [PATCH 01/10] Add stack-8.10.3.yaml --- stack-8.10.3.yaml | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 stack-8.10.3.yaml diff --git a/stack-8.10.3.yaml b/stack-8.10.3.yaml new file mode 100644 index 0000000000..8ad7e48037 --- /dev/null +++ b/stack-8.10.3.yaml @@ -0,0 +1,44 @@ +resolver: nightly-2020-12-09 +compiler: ghc-8.10.3 + +packages: +- . +- ./ghcide/hie-compat +- ./ghcide/ +- ./hls-plugin-api +- ./plugins/tactics +- ./plugins/hls-hlint-plugin +- ./plugins/hls-explicit-imports-plugin +- ./plugins/hls-retrie-plugin + +ghc-options: + "$everything": -haddock + +extra-deps: +- brittany-0.13.1.0 +- Cabal-3.0.2.0 +- clock-0.7.2 +- data-tree-print-0.1.0.2@rev:2 +- floskell-0.10.4 +- fourmolu-0.3.0.0 +- heapsize-0.3.0 +- implicit-hie-cradle-0.3.0.2 +- implicit-hie-0.1.2.5 +- lsp-test-0.11.0.6 +- monad-dijkstra-0.1.1.2 +- refinery-0.3.0.0 +- retrie-0.1.1.1 +- stylish-haskell-0.12.2.0 +- semigroups-0.18.5 +- temporary-1.2.1.1 + +flags: + haskell-language-server: + pedantic: true + retrie: + BuildExecutable: false + +nix: + packages: [ icu libcxx zlib ] + +concurrent-tests: false From 092c59d3f8ffad1ff00afa04aa7675c7c933fc54 Mon Sep 17 00:00:00 2001 From: jneira Date: Wed, 23 Dec 2020 22:00:37 +0100 Subject: [PATCH 02/10] Add ghc-8.10.3 and enable default stack.yaml --- .circleci/config.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c1c658bede..6d80340e55 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -137,7 +137,12 @@ jobs: - STACK_FILE: "stack-8.10.2.yaml" <<: *defaults - ghc-nightly: + ghc-8.10.3: + environment: + - STACK_FILE: "stack-8.10.3.yaml" + <<: *defaults + + ghc-default: environment: - STACK_FILE: "stack.yaml" <<: *defaults @@ -145,7 +150,7 @@ jobs: cabal: working_directory: ~/build docker: - - image: haskell:8.10.1 + - image: haskell:8.10.3 steps: - checkout - run: @@ -191,5 +196,6 @@ workflows: - ghc-8.8.4 - ghc-8.10.1 - ghc-8.10.2 - # - ghc-nightly + - ghc-8.10.3 + - ghc-default - cabal From da47a3f20937f34d99ef994776f2acd9ada17cc4 Mon Sep 17 00:00:00 2001 From: jneira Date: Wed, 23 Dec 2020 22:04:29 +0100 Subject: [PATCH 03/10] Add ghc-8.10.3 to gihub actions --- .github/workflows/build.yml | 2 +- .github/workflows/test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a00a34efe5..98d0f017e9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ jobs: strategy: fail-fast: false matrix: - ghc: ['8.10.2', '8.10.1', '8.8.4', '8.8.3', '8.8.2', '8.6.5', '8.6.4'] + ghc: ['8.10.3', '8.10.2', '8.10.1', '8.8.4', '8.8.3', '8.8.2', '8.6.5', '8.6.4'] os: [ubuntu-latest, macOS-latest, windows-latest] exclude: - os: windows-latest diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 54c41739a0..bbac124feb 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -7,7 +7,7 @@ jobs: strategy: fail-fast: true matrix: - ghc: ["8.10.2", "8.10.1", "8.8.4", "8.8.3", "8.8.2", "8.6.5", "8.6.4"] + ghc: ['8.10.3', "8.10.2", "8.10.1", "8.8.4", "8.8.3", "8.8.2", "8.6.5", "8.6.4"] os: [ubuntu-latest, windows-latest] exclude: - os: windows-latest From 6394dbc7b5f2a0ecbe719a229751d3d72291abfa Mon Sep 17 00:00:00 2001 From: jneira Date: Fri, 25 Dec 2020 20:28:27 +0100 Subject: [PATCH 04/10] Use ghc-lib-8.10.3 --- stack-8.10.1.yaml | 4 ++-- stack-8.10.2.yaml | 2 ++ stack-8.10.3.yaml | 2 ++ stack-8.6.4.yaml | 8 +++----- stack-8.6.5.yaml | 8 +++----- stack-8.8.2.yaml | 8 +++----- stack-8.8.3.yaml | 4 ++-- stack-8.8.4.yaml | 2 ++ 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/stack-8.10.1.yaml b/stack-8.10.1.yaml index dce21d958c..80d86db779 100644 --- a/stack-8.10.1.yaml +++ b/stack-8.10.1.yaml @@ -23,8 +23,8 @@ extra-deps: - data-tree-print-0.1.0.2@rev:2 - floskell-0.10.4 - fourmolu-0.3.0.0 - - ghc-lib-8.10.2.20200916 - - ghc-lib-parser-8.10.2.20200916 + - ghc-lib-8.10.3.20201220 + - ghc-lib-parser-8.10.3.20201220 - heapsize-0.3.0 - hie-bios-0.7.1 - hlint-3.2.3 diff --git a/stack-8.10.2.yaml b/stack-8.10.2.yaml index 9bd09b6cd9..6b366dfbdd 100644 --- a/stack-8.10.2.yaml +++ b/stack-8.10.2.yaml @@ -23,6 +23,8 @@ extra-deps: - data-tree-print-0.1.0.2@rev:2 - floskell-0.10.4 - fourmolu-0.3.0.0 + - ghc-lib-8.10.3.20201220 + - ghc-lib-parser-8.10.3.20201220 - heapsize-0.3.0 - implicit-hie-cradle-0.3.0.2 - implicit-hie-0.1.2.5 diff --git a/stack-8.10.3.yaml b/stack-8.10.3.yaml index 8ad7e48037..228f7fca47 100644 --- a/stack-8.10.3.yaml +++ b/stack-8.10.3.yaml @@ -21,6 +21,8 @@ extra-deps: - data-tree-print-0.1.0.2@rev:2 - floskell-0.10.4 - fourmolu-0.3.0.0 +- ghc-lib-8.10.3.20201220 +- ghc-lib-parser-8.10.3.20201220 - heapsize-0.3.0 - implicit-hie-cradle-0.3.0.2 - implicit-hie-0.1.2.5 diff --git a/stack-8.6.4.yaml b/stack-8.6.4.yaml index 0bea9434e9..1cdd6507b8 100644 --- a/stack-8.6.4.yaml +++ b/stack-8.6.4.yaml @@ -36,9 +36,9 @@ extra-deps: - ghc-check-0.5.0.1 - ghc-events-0.13.0 - ghc-exactprint-0.6.3.2 - - ghc-lib-8.10.2.20200916 - - ghc-lib-parser-8.10.2.20200916 - - ghc-lib-parser-ex-8.10.0.16 + - ghc-lib-8.10.3.20201220 + - ghc-lib-parser-8.10.3.20201220 + - ghc-lib-parser-ex-8.10.0.17 - ghc-source-gen-0.4.0.0 - ghc-trace-events-0.1.2.1 - haddock-api-2.22.0@rev:1 @@ -70,8 +70,6 @@ extra-deps: - regex-tdfa-1.3.1.0 - retrie-0.1.1.1 - semialign-1.1 - # - github: wz1000/shake - # commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef - stylish-haskell-0.12.2.0 - tasty-rerun-1.1.17 - temporary-1.2.1.1 diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml index 5d6b9c4cef..fa805f9276 100644 --- a/stack-8.6.5.yaml +++ b/stack-8.6.5.yaml @@ -35,9 +35,9 @@ extra-deps: - ghc-check-0.5.0.1 - ghc-events-0.13.0 - ghc-exactprint-0.6.3.2 - - ghc-lib-8.10.2.20200916 - - ghc-lib-parser-8.10.2.20200916 - - ghc-lib-parser-ex-8.10.0.16 + - ghc-lib-8.10.3.20201220 + - ghc-lib-parser-8.10.3.20201220 + - ghc-lib-parser-ex-8.10.0.17 - ghc-source-gen-0.4.0.0 - ghc-trace-events-0.1.2.1 - haddock-api-2.22.0@rev:1 @@ -69,8 +69,6 @@ extra-deps: - regex-tdfa-1.3.1.0 - retrie-0.1.1.1 - semialign-1.1 - # - github: wz1000/shake - # commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef - stylish-haskell-0.12.2.0 - tasty-rerun-1.1.17 - temporary-1.2.1.1 diff --git a/stack-8.8.2.yaml b/stack-8.8.2.yaml index 31febdf7ee..6f12ce8aca 100644 --- a/stack-8.8.2.yaml +++ b/stack-8.8.2.yaml @@ -31,9 +31,9 @@ extra-deps: - ghc-check-0.5.0.1 - ghc-events-0.13.0 - ghc-exactprint-0.6.3.2 - - ghc-lib-8.10.2.20200916 - - ghc-lib-parser-8.10.2.20200916 - - ghc-lib-parser-ex-8.10.0.16 + - ghc-lib-8.10.3.20201220 + - ghc-lib-parser-8.10.3.20201220 + - ghc-lib-parser-ex-8.10.0.17 - ghc-trace-events-0.1.2.1 - haddock-library-1.8.0 - haskell-lsp-0.22.0.0 @@ -57,8 +57,6 @@ extra-deps: - refinery-0.3.0.0 - retrie-0.1.1.1 - semigroups-0.18.5 - # - github: wz1000/shake - # commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef - stylish-haskell-0.12.2.0 - temporary-1.2.1.1 - these-1.1.1.1 diff --git a/stack-8.8.3.yaml b/stack-8.8.3.yaml index e15283d988..57d65a386d 100644 --- a/stack-8.8.3.yaml +++ b/stack-8.8.3.yaml @@ -29,8 +29,8 @@ extra-deps: - fourmolu-0.3.0.0 # - ghcide-0.6.0 - ghc-exactprint-0.6.3.2 - - ghc-lib-8.10.2.20200916 - - ghc-lib-parser-8.10.2.20200916 + - ghc-lib-8.10.3.20201220 + - ghc-lib-parser-8.10.3.20201220 - ghc-trace-events-0.1.2.1 - haskell-src-exts-1.21.1 - heapsize-0.3.0 diff --git a/stack-8.8.4.yaml b/stack-8.8.4.yaml index 9674f767cb..2e8f5bdab7 100644 --- a/stack-8.8.4.yaml +++ b/stack-8.8.4.yaml @@ -28,6 +28,8 @@ extra-deps: - fourmolu-0.3.0.0 # - ghcide-0.6.0 - ghc-exactprint-0.6.3.2 + - ghc-lib-8.10.3.20201220 + - ghc-lib-parser-8.10.3.20201220 - ghc-trace-events-0.1.2.1 - haskell-src-exts-1.21.1 - heapsize-0.3.0 From 28b0fe328e568f064c03dd893663f8ca03a43af0 Mon Sep 17 00:00:00 2001 From: jneira Date: Fri, 25 Dec 2020 21:51:02 +0100 Subject: [PATCH 05/10] docker image for 8.10.3 not prepared --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6d80340e55..4e49ad9b45 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -150,7 +150,7 @@ jobs: cabal: working_directory: ~/build docker: - - image: haskell:8.10.3 + - image: haskell:8.10.2 steps: - checkout - run: From 262b3a95717231f897eaebcb22189909a41135bd Mon Sep 17 00:00:00 2001 From: jneira Date: Sun, 27 Dec 2020 11:54:11 +0100 Subject: [PATCH 06/10] Add comment about docker image --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4e49ad9b45..8372afa8f1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -150,6 +150,8 @@ jobs: cabal: working_directory: ~/build docker: + # We have to wait to a docker image with ghc-8.10.3 + # See https://github.com/haskell/docker-haskell/issues/31 - image: haskell:8.10.2 steps: - checkout From e77be067c02c3c1260176192fede041d149940de Mon Sep 17 00:00:00 2001 From: jneira Date: Tue, 29 Dec 2020 23:58:59 +0100 Subject: [PATCH 07/10] Sync default stack.yaml --- stack.yaml | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/stack.yaml b/stack.yaml index 96394c505e..fa805f9276 100644 --- a/stack.yaml +++ b/stack.yaml @@ -3,9 +3,9 @@ resolver: lts-14.27 # Last 8.6.5 packages: - . - ./hie-compat - - ./ghcide - - ./shake-bench + - ./ghcide/ - ./hls-plugin-api + # - ./shake-bench - ./plugins/hls-class-plugin - ./plugins/hls-eval-plugin - ./plugins/hls-explicit-imports-plugin @@ -35,9 +35,9 @@ extra-deps: - ghc-check-0.5.0.1 - ghc-events-0.13.0 - ghc-exactprint-0.6.3.2 - - ghc-lib-8.10.2.20200916 - - ghc-lib-parser-8.10.2.20200916 - - ghc-lib-parser-ex-8.10.0.16 + - ghc-lib-8.10.3.20201220 + - ghc-lib-parser-8.10.3.20201220 + - ghc-lib-parser-ex-8.10.0.17 - ghc-source-gen-0.4.0.0 - ghc-trace-events-0.1.2.1 - haddock-api-2.22.0@rev:1 @@ -69,8 +69,6 @@ extra-deps: - regex-tdfa-1.3.1.0 - retrie-0.1.1.1 - semialign-1.1 - # - github: wz1000/shake - # commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef - stylish-haskell-0.12.2.0 - tasty-rerun-1.1.17 - temporary-1.2.1.1 @@ -80,12 +78,6 @@ extra-deps: - with-utf8-1.0.2.1@sha256:95c02fffa643ddbeb092359802a512007c3e644cd509809f4716ad54592c437b,3057 - th-env-0.1.0.2@sha256:d8f1f37f42a8f1a22404d7d0579528af18f5dac7232cca6bdbd5117c115a0ad5,1370 -flags: - haskell-language-server: - pedantic: true - retrie: - BuildExecutable: false - configure-options: ghcide: - --disable-library-for-ghci @@ -94,6 +86,12 @@ configure-options: heapsize: - --disable-library-for-ghci +flags: + haskell-language-server: + pedantic: true + retrie: + BuildExecutable: false + # allow-newer: true nix: From 50e46c1cfbd0a74aa56cd5b538784f43c12fd4e4 Mon Sep 17 00:00:00 2001 From: jneira Date: Wed, 30 Dec 2020 00:07:41 +0100 Subject: [PATCH 08/10] Adapt stack yaml to merged ghcide --- stack-8.10.3.yaml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/stack-8.10.3.yaml b/stack-8.10.3.yaml index 228f7fca47..561c742938 100644 --- a/stack-8.10.3.yaml +++ b/stack-8.10.3.yaml @@ -3,13 +3,15 @@ compiler: ghc-8.10.3 packages: - . -- ./ghcide/hie-compat +- ./hie-compat - ./ghcide/ - ./hls-plugin-api -- ./plugins/tactics -- ./plugins/hls-hlint-plugin +# - ./shake-bench +- ./plugins/hls-class-plugin - ./plugins/hls-explicit-imports-plugin +- ./plugins/hls-hlint-plugin - ./plugins/hls-retrie-plugin +- ./plugins/tactics ghc-options: "$everything": -haddock @@ -34,6 +36,14 @@ extra-deps: - semigroups-0.18.5 - temporary-1.2.1.1 +configure-options: + ghcide: + - --disable-library-for-ghci + haskell-language-server: + - --disable-library-for-ghci + heapsize: + - --disable-library-for-ghci + flags: haskell-language-server: pedantic: true From f3bf627af3b32944686ec72c5d99c19b085b8463 Mon Sep 17 00:00:00 2001 From: jneira Date: Wed, 30 Dec 2020 15:35:54 +0100 Subject: [PATCH 09/10] Format and add eval plugin --- stack-8.10.3.yaml | 57 ++++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/stack-8.10.3.yaml b/stack-8.10.3.yaml index 561c742938..a652df8273 100644 --- a/stack-8.10.3.yaml +++ b/stack-8.10.3.yaml @@ -2,39 +2,40 @@ resolver: nightly-2020-12-09 compiler: ghc-8.10.3 packages: -- . -- ./hie-compat -- ./ghcide/ -- ./hls-plugin-api -# - ./shake-bench -- ./plugins/hls-class-plugin -- ./plugins/hls-explicit-imports-plugin -- ./plugins/hls-hlint-plugin -- ./plugins/hls-retrie-plugin -- ./plugins/tactics + - . + - ./hie-compat + - ./ghcide/ + - ./hls-plugin-api + # - ./shake-bench + - ./plugins/hls-class-plugin + - ./plugins/hls-eval-plugin + - ./plugins/hls-explicit-imports-plugin + - ./plugins/hls-hlint-plugin + - ./plugins/hls-retrie-plugin + - ./plugins/tactics ghc-options: "$everything": -haddock extra-deps: -- brittany-0.13.1.0 -- Cabal-3.0.2.0 -- clock-0.7.2 -- data-tree-print-0.1.0.2@rev:2 -- floskell-0.10.4 -- fourmolu-0.3.0.0 -- ghc-lib-8.10.3.20201220 -- ghc-lib-parser-8.10.3.20201220 -- heapsize-0.3.0 -- implicit-hie-cradle-0.3.0.2 -- implicit-hie-0.1.2.5 -- lsp-test-0.11.0.6 -- monad-dijkstra-0.1.1.2 -- refinery-0.3.0.0 -- retrie-0.1.1.1 -- stylish-haskell-0.12.2.0 -- semigroups-0.18.5 -- temporary-1.2.1.1 + - brittany-0.13.1.0 + - Cabal-3.0.2.0 + - clock-0.7.2 + - data-tree-print-0.1.0.2@rev:2 + - floskell-0.10.4 + - fourmolu-0.3.0.0 + - ghc-lib-8.10.3.20201220 + - ghc-lib-parser-8.10.3.20201220 + - heapsize-0.3.0 + - implicit-hie-cradle-0.3.0.2 + - implicit-hie-0.1.2.5 + - lsp-test-0.11.0.6 + - monad-dijkstra-0.1.1.2 + - refinery-0.3.0.0 + - retrie-0.1.1.1 + - stylish-haskell-0.12.2.0 + - semigroups-0.18.5 + - temporary-1.2.1.1 configure-options: ghcide: From cd3624346dd60e7478056af13a56c5cf873ee501 Mon Sep 17 00:00:00 2001 From: jneira Date: Fri, 1 Jan 2021 22:16:16 +0100 Subject: [PATCH 10/10] Use first nightly with ghc-8.10.3 --- stack-8.10.3.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/stack-8.10.3.yaml b/stack-8.10.3.yaml index a652df8273..25e791c006 100644 --- a/stack-8.10.3.yaml +++ b/stack-8.10.3.yaml @@ -1,5 +1,4 @@ -resolver: nightly-2020-12-09 -compiler: ghc-8.10.3 +resolver: nightly-2021-01-01 # first ghc-8.10.3 nightly packages: - . @@ -24,8 +23,6 @@ extra-deps: - data-tree-print-0.1.0.2@rev:2 - floskell-0.10.4 - fourmolu-0.3.0.0 - - ghc-lib-8.10.3.20201220 - - ghc-lib-parser-8.10.3.20201220 - heapsize-0.3.0 - implicit-hie-cradle-0.3.0.2 - implicit-hie-0.1.2.5