Skip to content

Post ghc-9.2.1 config cleanup #2582

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jan 13, 2022
Merged

Post ghc-9.2.1 config cleanup #2582

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
58b0e47
Uncomment packages thanks to allow-newer
jneira Jan 13, 2022
9f25069
Clean up cabal config files
jneira Jan 13, 2022
03bb73d
Enable floskell for ghc-9.2.1
jneira Jan 13, 2022
9eb6843
Merge branch 'master' into ghc-9.2.1-2
jneira Jan 13, 2022
8e25713
removing bad flag usage
jneira Jan 13, 2022
3b13c8e
correct bad merge
jneira Jan 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ jobs:
name: Test hls-brittany-plugin
run: cabal test hls-brittany-plugin --test-options="$TEST_OPTS" || cabal test hls-brittany-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-brittany-plugin --test-options="$TEST_OPTS"

- if: matrix.test && matrix.ghc != '9.2.1'
- if: matrix.test
name: Test hls-floskell-plugin
run: cabal test hls-floskell-plugin --test-options="$TEST_OPTS" || cabal test hls-floskell-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-floskell-plugin --test-options="$TEST_OPTS"

Expand Down
4 changes: 0 additions & 4 deletions cabal-ghc901.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,3 @@ allow-newer:

floskell:base,
floskell:ghc-prim,

-- for shake-bench
Chart-diagrams:diagrams-core,
SVGFonts:diagrams-core
111 changes: 64 additions & 47 deletions cabal-ghc921.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,33 +6,26 @@ packages:
./ghcide
./hls-plugin-api
./hls-test-utils
-- ./plugins/hls-tactics-plugin
-- ./plugins/hls-brittany-plugin
-- ./plugins/hls-stylish-haskell-plugin
-- ./plugins/hls-fourmolu-plugin
./plugins/hls-tactics-plugin
./plugins/hls-brittany-plugin
./plugins/hls-stylish-haskell-plugin
./plugins/hls-fourmolu-plugin
./plugins/hls-class-plugin
-- ./plugins/hls-eval-plugin
./plugins/hls-eval-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-haddock-comments-plugin
-- ./plugins/hls-splice-plugin
./plugins/hls-refine-imports-plugin
./plugins/hls-hlint-plugin
./plugins/hls-rename-plugin
./plugins/hls-retrie-plugin
./plugins/hls-haddock-comments-plugin
./plugins/hls-splice-plugin
./plugins/hls-qualify-imported-names-plugin
-- ./plugins/hls-floskell-plugin
./plugins/hls-floskell-plugin
./plugins/hls-pragmas-plugin
./plugins/hls-module-name-plugin
-- ./plugins/hls-ormolu-plugin
./plugins/hls-ormolu-plugin
./plugins/hls-call-hierarchy-plugin
-- ./plugins/hls-alternate-number-format-plugin

source-repository-package
type: git
location: https://github.com/tfausak/unix-compat
tag: 154c3a63f154cb49c51d5f9d13488e8119631d8a
-- To fix windows build
-- https://github.com/jacobstanley/unix-compat/pull/47
./plugins/hls-alternate-number-format-plugin

repository head.hackage.ghc.haskell.org
url: https://ghc.gitlab.haskell.org/head.hackage/
Expand All @@ -54,7 +47,7 @@ package *

write-ghc-environment-files: never

index-state: 2022-01-03T18:45:00Z
index-state: 2022-01-11T22:05:45Z

constraints:
-- These plugins don't build/work on GHC92 yet
Expand All @@ -65,7 +58,6 @@ constraints:
-callhierarchy
-class
-eval
-floskell
-fourmolu
-haddockComments
-hlint
Expand All @@ -85,34 +77,59 @@ constraints:
retrie >= 1.2,
direct-sqlite == 2.3.26,
lens >= 5.0.1,
primitive-unlifted ==0.1.3.1,
-- these constraints are for head.hackage
aeson ==1.5.6.0,
primitive-unlifted ==0.1.3.1

allow-newer:
Cabal,
base,
binary,
bytestring,
ghc,
ghc-bignum,
ghc-prim,
integer-gmp,
template-haskell,
text,
time,

diagrams-postscript:lens,
diagrams-postscript:diagrams-core,
diagrams-postscript:monoid-extras,
dependent-sum:some,
dependent-sum:constraints,
diagrams:diagrams-core,
Chart-diagrams:diagrams-core,
SVGFonts:diagrams-core,
-- base,

-- for shake-bench
Chart:lens,
Chart-diagrams:lens,

-- for head.hackage
primitive-unlifted:base
primitive-unlifted:base,

brittany:ghc-boot,
brittany:ghc-boot-th,
brittany:ghc,
brittany:ghc-exactprint,
brittany:bytestring,
brittany:base,
-- https://github.com/lspitzner/multistate/pull/8
multistate:base,
-- https://github.com/lspitzner/data-tree-print/pull/3
data-tree-print:base,
-- https://github.com/lspitzner/butcher/pull/8
butcher:base,

stylish-haskell:ghc-lib-parser,
stylish-haskell:Cabal,
stylish-haskell:bytestring,
stylish-haskell:aeson,

ormolu:ghc-lib-parser,

fourmolu:ghc-lib-parser,
fourmolu:Cabal,

hls-hlint-plugin:ghc-lib,
hls-hlint-plugin:ghc-lib-parser,
hls-hlint-plugin:ghc-lib-parser-ex,
hlint:ghc-lib-parser,
hlint:ghc-lib-parser-ex,
-- See https://github.com/mpickering/apply-refact/pull/116
apply-refact:base,

implicit-hie-cradle:bytestring,
implicit-hie-cradle:time,

-- For tactics
ghc-source-gen:ghc,

-- for ghcide:test via ghc-typelits-knownnat
ghc-typelits-natnormalise:ghc-bignum,

hiedb:base

allow-older:
primitive-extras:primitive-unlifted
2 changes: 1 addition & 1 deletion ghcide/ghcide.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ library
ghc-paths,
cryptohash-sha1 >=0.11.100 && <0.12,
hie-bios >= 0.8 && < 0.9.0,
implicit-hie-cradle >= 0.3.0.5 && < 0.4,
implicit-hie-cradle ^>= 0.3.0.5 || ^>= 0.5,
base16-bytestring >=0.1.1 && <1.1
if os(windows)
build-depends:
Expand Down
4 changes: 2 additions & 2 deletions haskell-language-server.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ common qualifyImportedNames
-- formatters

common floskell
if flag(floskell) && (impl(ghc < 9.2.1) || flag(ignore-plugins-ghc-bounds))
if flag(floskell) || flag(ignore-plugins-ghc-bounds))
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

trailing paren

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ugh I did the same error I just corrected in the other pr 🤦‍♂️

build-depends: hls-floskell-plugin ^>=1.0.0.0
cpp-options: -Dfloskell

Expand All @@ -293,7 +293,7 @@ common fourmolu
cpp-options: -Dfourmolu

common ormolu
if flag(ormolu)
if flag(ormolu) || flag(ignore-plugins-ghc-bounds))
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and here

build-depends: hls-ormolu-plugin ^>=1.0.0.0
cpp-options: -Dormolu

Expand Down
4 changes: 1 addition & 3 deletions hie-compat/hie-compat.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ flag ghc-lib
library
default-language: Haskell2010
build-depends:
base < 4.16, array, bytestring, containers, directory, filepath, transformers
base < 4.17, array, bytestring, containers, directory, filepath, transformers
if flag(ghc-lib)
build-depends: ghc-lib
else
Expand All @@ -50,5 +50,3 @@ library
hs-source-dirs: src-reexport-ghc9
if (impl(ghc >= 9.2) && impl(ghc < 9.3))
hs-source-dirs: src-reexport-ghc9