From cd6a7ad71d50f37a5b7b62c60cd7e201a8306b73 Mon Sep 17 00:00:00 2001 From: Zubin Duggal Date: Thu, 1 Sep 2022 16:29:15 +0530 Subject: [PATCH 1/8] Revert "drop windows for 9.4.2" This reverts commit feeaa3c5c7c8d11d02200302ab7dea988597b040. --- .github/workflows/test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index faf0529644..849dd9c7f3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -89,6 +89,9 @@ jobs: - os: ubuntu-latest ghc: '8.6.5' test: true + - os: windows-latest + ghc: '9.4.2' + test: true - os: windows-latest ghc: '9.2.4' test: true From a26b0f1a026cf4e4aabffb8c796a5a98d57d076d Mon Sep 17 00:00:00 2001 From: Zubin Duggal Date: Thu, 1 Sep 2022 16:29:47 +0530 Subject: [PATCH 2/8] Fix entropy to 0.4.1.10 to fix build on windows --- cabal.project | 1 + 1 file changed, 1 insertion(+) diff --git a/cabal.project b/cabal.project index eb2a58c05c..95d0b85672 100644 --- a/cabal.project +++ b/cabal.project @@ -51,6 +51,7 @@ write-ghc-environment-files: never index-state: 2022-08-15T06:53:13Z constraints: + entropy == 0.4.1.10, hyphenation +embed, -- remove this when hlint sets ghc-lib to true by default -- https://github.com/ndmitchell/hlint/issues/1376 From 319ef7fddc6c0e960e15dae622a9fa6f501402ea Mon Sep 17 00:00:00 2001 From: Zubin Duggal Date: Thu, 1 Sep 2022 17:01:04 +0530 Subject: [PATCH 3/8] Use scoped allow-newer --- cabal.project | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/cabal.project b/cabal.project index 95d0b85672..10934aa7e7 100644 --- a/cabal.project +++ b/cabal.project @@ -48,10 +48,11 @@ package * write-ghc-environment-files: never -index-state: 2022-08-15T06:53:13Z +index-state: 2022-08-29T06:53:13Z constraints: - entropy == 0.4.1.10, + entropy >= 0.4.1.10, + basement >= 0.0.15, hyphenation +embed, -- remove this when hlint sets ghc-lib to true by default -- https://github.com/ndmitchell/hlint/issues/1376 @@ -87,8 +88,28 @@ source-repository-package -- https://github.com/haskell/lsp/pull/450 allow-newer: - base, ghc-prim, ghc-bignum, ghc, Cabal, binary, bytestring, unix, time, template-haskell, + -- ghc-9.4 + Chart-diagrams:lens, + Chart:lens, + co-log-core:base, + constraints-extras:base, + constraints-extras:template-haskell, + dependent-sum:some, + diagrams-contrib:base, + diagrams-contrib:lens, + diagrams-postscript:base, + diagrams-postscript:lens, + diagrams-svg:base, + diagrams-svg:lens, ghc-paths:Cabal, + haddock-library:base, + hie-bios:aeson, + hie-bios:ghc, + monoid-extras:base, + monoid-subclasses:vector, + svg-builder:base, + uuid:time, + vector-space:base, -- ghc-9.2 ---------- From 7cb3f7cb75d4a9fadba471e7ccfed2e25d263f6c Mon Sep 17 00:00:00 2001 From: Zubin Duggal Date: Thu, 1 Sep 2022 17:04:09 +0530 Subject: [PATCH 4/8] Use scoped allow-newer --- cabal.project | 1 + 1 file changed, 1 insertion(+) diff --git a/cabal.project b/cabal.project index 10934aa7e7..37fbe414d2 100644 --- a/cabal.project +++ b/cabal.project @@ -101,6 +101,7 @@ allow-newer: diagrams-postscript:lens, diagrams-svg:base, diagrams-svg:lens, + ekg-json:base, ghc-paths:Cabal, haddock-library:base, hie-bios:aeson, From 18613600ad67c07dcfc8df5813d0fb3e2c525979 Mon Sep 17 00:00:00 2001 From: Zubin Duggal Date: Thu, 1 Sep 2022 17:07:36 +0530 Subject: [PATCH 5/8] Bump base version for hie-compat --- hie-compat/hie-compat.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hie-compat/hie-compat.cabal b/hie-compat/hie-compat.cabal index 7e3aee55a6..ab94fb7a77 100644 --- a/hie-compat/hie-compat.cabal +++ b/hie-compat/hie-compat.cabal @@ -25,7 +25,7 @@ flag ghc-lib library default-language: Haskell2010 build-depends: - base < 4.17, array, bytestring, containers, directory, filepath, transformers + base < 4.18, array, bytestring, containers, directory, filepath, transformers if flag(ghc-lib) && impl(ghc < 9) build-depends: ghc-lib < 9.0 else From 0f7d5afa378589f2bafb5b4bd15bd4b33894ac3a Mon Sep 17 00:00:00 2001 From: Zubin Duggal Date: Thu, 1 Sep 2022 17:20:15 +0530 Subject: [PATCH 6/8] Add comments --- cabal.project | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cabal.project b/cabal.project index 37fbe414d2..3c1b731e0a 100644 --- a/cabal.project +++ b/cabal.project @@ -51,7 +51,9 @@ write-ghc-environment-files: never index-state: 2022-08-29T06:53:13Z constraints: + -- For GHC 9.4, older versions of entropy fail to build on Windows entropy >= 0.4.1.10, + -- For GHC 9.4 basement >= 0.0.15, hyphenation +embed, -- remove this when hlint sets ghc-lib to true by default From 9f1d13b76258725060588868ff7545752ec9e7ae Mon Sep 17 00:00:00 2001 From: Zubin Duggal Date: Fri, 2 Sep 2022 17:22:01 +0530 Subject: [PATCH 7/8] remove ghcide-test-utils-internal --- ghcide/ghcide.cabal | 39 +-------------------------------------- 1 file changed, 1 insertion(+), 38 deletions(-) diff --git a/ghcide/ghcide.cabal b/ghcide/ghcide.cabal index 810d8a47f1..0329130c88 100644 --- a/ghcide/ghcide.cabal +++ b/ghcide/ghcide.cabal @@ -349,7 +349,6 @@ test-suite ghcide-tests ghc, -------------------------------------------------------------- ghcide, - ghcide-test-utils-internal, lsp, lsp-types, hls-plugin-api, @@ -379,7 +378,7 @@ test-suite ghcide-tests record-hasfield if impl(ghc < 9.3) build-depends: ghc-typelits-knownnat - hs-source-dirs: test/cabal test/exe bench/lib + hs-source-dirs: test/cabal test/exe test/src bench/lib ghc-options: -threaded -Wall -Wno-name-shadowing -O0 -Wno-unticked-promoted-constructors main-is: Main.hs other-modules: @@ -387,42 +386,6 @@ test-suite ghcide-tests FuzzySearch Progress HieDbRetry - default-extensions: - BangPatterns - DeriveFunctor - DeriveGeneric - FlexibleContexts - GeneralizedNewtypeDeriving - LambdaCase - NamedFieldPuns - OverloadedStrings - RecordWildCards - ScopedTypeVariables - StandaloneDeriving - TupleSections - TypeApplications - ViewPatterns - -library ghcide-test-utils-internal - default-language: Haskell2010 - build-depends: - aeson, - base, - containers, - data-default, - directory, - extra, - filepath, - ghcide, - lsp-types, - hls-plugin-api, - lens, - lsp-test ^>= 0.14, - tasty-hunit >= 0.10, - text, - hs-source-dirs: test/src - ghc-options: -Wunused-packages - exposed-modules: Development.IDE.Test Development.IDE.Test.Diagnostic default-extensions: From 21379119b70143bccd8b6be2fcb8a1705b924772 Mon Sep 17 00:00:00 2001 From: Zubin Duggal Date: Fri, 2 Sep 2022 18:21:43 +0530 Subject: [PATCH 8/8] Fix windows tests --- ghcide/test/exe/Main.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghcide/test/exe/Main.hs b/ghcide/test/exe/Main.hs index 523a7474f8..384efce985 100644 --- a/ghcide/test/exe/Main.hs +++ b/ghcide/test/exe/Main.hs @@ -2002,7 +2002,7 @@ completionDocTests = ] where brokenForGhc9 = knownBrokenFor (BrokenForGHC [GHC90, GHC92, GHC94]) "Completion doc doesn't support ghc9" - brokenForWinGhc9 = knownBrokenFor (BrokenSpecific Windows [GHC90, GHC92, GHC94]) "Extern doc doesn't support Windows for ghc9.2" + brokenForWinGhc9 = knownBrokenFor (BrokenSpecific Windows [GHC90, GHC92]) "Extern doc doesn't support Windows for ghc9.2" -- https://gitlab.haskell.org/ghc/ghc/-/issues/20903 brokenForMacGhc9 = knownBrokenFor (BrokenSpecific MacOS [GHC90, GHC92, GHC94]) "Extern doc doesn't support MacOS for ghc9" test doc pos label mn expected = do