diff --git a/.circleci/config.yml b/.circleci/config.yml index 22aa3f0639..e57008bcd3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -75,9 +75,9 @@ defaults: &defaults version: 2 jobs: - stackage-lts19: + stackage-lts21: environment: - - STACK_FILE: "stack-lts19.yaml" + - STACK_FILE: "stack-lts21.yaml" <<: *defaults stackage-nightly: @@ -90,5 +90,5 @@ workflows: version: 2 multiple-ghcs: jobs: - - stackage-lts19 + - stackage-lts21 - stackage-nightly diff --git a/stack-lts19.yaml b/stack-lts21.yaml similarity index 59% rename from stack-lts19.yaml rename to stack-lts21.yaml index 0ece22d38a..b90fa0d4e5 100644 --- a/stack-lts19.yaml +++ b/stack-lts21.yaml @@ -1,4 +1,4 @@ -resolver: lts-19.19 +resolver: lts-21.2 # ghc-9.4 packages: - . @@ -9,61 +9,51 @@ packages: - ./hls-plugin-api - ./hls-test-utils # - ./shake-bench - - ./plugins/hls-cabal-plugin + - ./plugins/hls-alternate-number-format-plugin - ./plugins/hls-cabal-fmt-plugin + - ./plugins/hls-cabal-plugin - ./plugins/hls-call-hierarchy-plugin + - ./plugins/hls-change-type-signature-plugin - ./plugins/hls-class-plugin - - ./plugins/hls-haddock-comments-plugin + - ./plugins/hls-code-range-plugin - ./plugins/hls-eval-plugin + - ./plugins/hls-explicit-fixity-plugin - ./plugins/hls-explicit-imports-plugin - - ./plugins/hls-refine-imports-plugin - - ./plugins/hls-hlint-plugin - - ./plugins/hls-rename-plugin - - ./plugins/hls-retrie-plugin - - ./plugins/hls-splice-plugin - - ./plugins/hls-tactics-plugin - - ./plugins/hls-qualify-imported-names-plugin - - ./plugins/hls-stylish-haskell-plugin + - ./plugins/hls-explicit-record-fields-plugin - ./plugins/hls-floskell-plugin - ./plugins/hls-fourmolu-plugin - - ./plugins/hls-pragmas-plugin + - ./plugins/hls-gadt-plugin + # - ./plugins/hls-haddock-comments-plugin + - ./plugins/hls-hlint-plugin - ./plugins/hls-module-name-plugin - ./plugins/hls-ormolu-plugin - - ./plugins/hls-alternate-number-format-plugin - - ./plugins/hls-code-range-plugin - - ./plugins/hls-change-type-signature-plugin - - ./plugins/hls-gadt-plugin - - ./plugins/hls-explicit-fixity-plugin + - ./plugins/hls-overloaded-record-dot-plugin + - ./plugins/hls-pragmas-plugin + - ./plugins/hls-qualify-imported-names-plugin - ./plugins/hls-refactor-plugin - - ./plugins/hls-explicit-record-fields-plugin + - ./plugins/hls-refine-imports-plugin + - ./plugins/hls-rename-plugin + - ./plugins/hls-retrie-plugin + - ./plugins/hls-splice-plugin + # - ./plugins/hls-stan-plugin + - ./plugins/hls-stylish-haskell-plugin + # - ./plugins/hls-tactics-plugin ghc-options: "$everything": -haddock +# stylish-haskell>strict +allow-newer: true + extra-deps: -- Cabal-3.6.0.0 -# needed for tests of hls-cabal-fmt-plugin -- cabal-fmt-0.1.6@sha256:54041d50c8148c32d1e0a67aef7edeebac50ae33571bef22312f6815908eac19,3626 -- floskell-0.10.6@sha256:e77d194189e8540abe2ace2c7cb8efafc747ca35881a2fefcbd2d40a1292e036,3819 -- fourmolu-0.6.0.0 -- ghc-lib-9.2.4.20220729 -- ghc-lib-parser-9.2.4.20220729 -- ghc-lib-parser-ex-9.2.0.4 +- floskell-0.10.7 - hiedb-0.4.3.0 -- hlint-3.4 -- implicit-hie-0.1.2.7@sha256:82bbbb1a8c05f99c8af3c16ac53e80c8648d8bf047b25ed5ce45a135bd736907,3122 -- implicit-hie-cradle-0.5.0.0@sha256:4276f60f3a59bc22df03fd918f73bca9f777de9568f85e3a8be8bd7566234a59,2368 +- implicit-hie-0.1.2.7 +- implicit-hie-cradle-0.5.0.1 - monad-dijkstra-0.1.1.3 -- ormolu-0.5.0.0 -- refinery-0.4.0.0@sha256:fe3a43add8ff1db5cfffee7e7694c86128b1dfe62c541f26e25a8eadf9585610,1663 -- retrie-1.1.0.0 -- stylish-haskell-0.14.2.0@sha256:fffe1c13ad4c2678cf28a7470cac5d3bf20c71c36f09969e3e5f186787cceb7c,4321 -- co-log-core-0.3.1.0 -- lsp-2.0.0.0 -- lsp-types-2.0.0.1 -- lsp-test-0.15.0.0 -- hie-bios-0.12.0 -- row-types-1.0.1.2 +- algebraic-graphs-0.6.1 +- retrie-1.2.2 +- stylish-haskell-0.14.4.0 configure-options: ghcide: @@ -79,7 +69,7 @@ flags: # Stack doesn't support automatic flags. hyphenation: embed: true - hlint: + stylish-haskell: ghc-lib: true nix: diff --git a/stack.yaml b/stack.yaml index c28042b4c0..473661211e 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,93 +1,74 @@ -resolver: nightly-2022-08-15 +resolver: nightly-2023-07-10 # ghc-9.6.2 packages: -- . -- ./hie-compat -- ./hls-graph -- ./ghcide/ -- ./ghcide/test -- ./hls-plugin-api -- ./hls-test-utils -- ./shake-bench -- ./plugins/hls-cabal-plugin -- ./plugins/hls-cabal-fmt-plugin -- ./plugins/hls-call-hierarchy-plugin -- ./plugins/hls-class-plugin -# - ./plugins/hls-haddock-comments-plugin -- ./plugins/hls-eval-plugin -- ./plugins/hls-explicit-imports-plugin -- ./plugins/hls-qualify-imported-names-plugin -- ./plugins/hls-refine-imports-plugin -- ./plugins/hls-hlint-plugin -- ./plugins/hls-rename-plugin -# - ./plugins/hls-retrie-plugin -# - ./plugins/hls-splice-plugin -# - ./plugins/hls-tactics-plugin -- ./plugins/hls-stylish-haskell-plugin -- ./plugins/hls-floskell-plugin -- ./plugins/hls-fourmolu-plugin -- ./plugins/hls-pragmas-plugin -- ./plugins/hls-module-name-plugin -- ./plugins/hls-ormolu-plugin -- ./plugins/hls-alternate-number-format-plugin -- ./plugins/hls-code-range-plugin -- ./plugins/hls-change-type-signature-plugin -- ./plugins/hls-gadt-plugin -- ./plugins/hls-explicit-fixity-plugin -- ./plugins/hls-refactor-plugin -- ./plugins/hls-explicit-record-fields-plugin -- ./plugins/hls-overloaded-record-dot-plugin + - . + - ./hie-compat + - ./hls-graph + - ./ghcide/ + - ./ghcide/test + - ./hls-plugin-api + - ./hls-test-utils + # - ./shake-bench + - ./plugins/hls-alternate-number-format-plugin + - ./plugins/hls-cabal-fmt-plugin + - ./plugins/hls-cabal-plugin + - ./plugins/hls-call-hierarchy-plugin + - ./plugins/hls-change-type-signature-plugin + - ./plugins/hls-class-plugin + - ./plugins/hls-code-range-plugin + - ./plugins/hls-eval-plugin + - ./plugins/hls-explicit-fixity-plugin + - ./plugins/hls-explicit-imports-plugin + - ./plugins/hls-explicit-record-fields-plugin + # - ./plugins/hls-floskell-plugin + - ./plugins/hls-fourmolu-plugin + - ./plugins/hls-gadt-plugin + # - ./plugins/hls-haddock-comments-plugin + - ./plugins/hls-hlint-plugin + - ./plugins/hls-module-name-plugin + - ./plugins/hls-ormolu-plugin + - ./plugins/hls-overloaded-record-dot-plugin + - ./plugins/hls-pragmas-plugin + - ./plugins/hls-qualify-imported-names-plugin + - ./plugins/hls-refactor-plugin + - ./plugins/hls-refine-imports-plugin + - ./plugins/hls-rename-plugin + - ./plugins/hls-retrie-plugin + - ./plugins/hls-splice-plugin + # - ./plugins/hls-stan-plugin + - ./plugins/hls-stylish-haskell-plugin + # - ./plugins/hls-tactics-plugin -extra-deps: -# needed for tests of hls-cabal-fmt-plugin -- cabal-fmt-0.1.6@sha256:54041d50c8148c32d1e0a67aef7edeebac50ae33571bef22312f6815908eac19,3626 -- floskell-0.10.6@sha256:e77d194189e8540abe2ace2c7cb8efafc747ca35881a2fefcbd2d40a1292e036,3819 -- hiedb-0.4.3.0 -- implicit-hie-0.1.2.7@sha256:82bbbb1a8c05f99c8af3c16ac53e80c8648d8bf047b25ed5ce45a135bd736907,3122 -- implicit-hie-cradle-0.5.0.0@sha256:4276f60f3a59bc22df03fd918f73bca9f777de9568f85e3a8be8bd7566234a59,2368 -- monad-dijkstra-0.1.1.3@sha256:d2fc098d7c122555e726830a12ae0423ac187f89de9228f32e56e2f6fc2238e1,1900 -- retrie-1.2.0.1 -- co-log-core-0.3.1.0 -- lsp-2.0.0.0 -- lsp-types-2.0.0.1 -- lsp-test-0.15.0.0 -- hie-bios-0.12.0 -- row-types-1.0.1.2 +ghc-options: + "$everything": -haddock -# currently needed for ghcide>extra, etc. +# Remove this after https://github.com/haskell-works/hw-prim/pull/146 merged allow-newer: true -ghc-options: - "$everything": -haddock +extra-deps: +# - floskell-0.10.7 +- hiedb-0.4.3.0 +- implicit-hie-0.1.2.7 +- implicit-hie-cradle-0.5.0.1 +- fourmolu-0.12.0.0 +- algebraic-graphs-0.6.1 +- retrie-1.2.2 +- hw-fingertree-0.1.2.1 +- hw-prim-0.6.3.2 +- ansi-terminal-0.11.5 configure-options: ghcide: - - --disable-library-for-ghci + - --disable-library-for-ghci haskell-language-server: - - --disable-library-for-ghci - heapsize: - - --disable-library-for-ghci + - --disable-library-for-ghci flags: haskell-language-server: pedantic: true - - ignore-plugins-ghc-bounds: true - haddockComments: false - retrie: false - splice: false - tactic: false - retrie: BuildExecutable: false # Stack doesn't support automatic flags. - # Use ghc-lib force instead of ghc itself - ghc-lib-parser-ex: - auto: false - hlint: - ghc-lib: true - stylish-haskell: - ghc-lib: true hyphenation: embed: true @@ -95,5 +76,3 @@ nix: packages: [ icu libcxx zlib ] concurrent-tests: false - -system-ghc: true