From de19fbfb03fd28e9c13855a11b41ffd3173387b3 Mon Sep 17 00:00:00 2001 From: jneira Date: Tue, 3 Mar 2020 00:00:27 +0100 Subject: [PATCH 1/5] Set haskell-src-exts lower bound to 1.22 --- haskell-ide-engine.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haskell-ide-engine.cabal b/haskell-ide-engine.cabal index 248b9557c..0efc2dbea 100644 --- a/haskell-ide-engine.cabal +++ b/haskell-ide-engine.cabal @@ -75,7 +75,7 @@ library , haddock-library , haskell-lsp == 0.20.* , haskell-lsp-types == 0.20.* - , haskell-src-exts + , haskell-src-exts >= 1.22 , hie-plugin-api >= 1.1 , hoogle >= 5.0.13 , hsimport From d5162dee974a1b9f111e1812a88672a00b14ba00 Mon Sep 17 00:00:00 2001 From: jneira Date: Tue, 3 Mar 2020 00:00:59 +0100 Subject: [PATCH 2/5] Use master versions of hsimport and floskell --- cabal.project | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/cabal.project b/cabal.project index 325e70d66..f627c70b6 100644 --- a/cabal.project +++ b/cabal.project @@ -9,8 +9,21 @@ source-repository-package location: https://github.com/jneira/cabal-helper.git tag: ffb1f57a5ffc6b7ac3c46a9974c4420a6d2bb9b2 +source-repository-package + type: git + location: https://github.com/dan-t/hsimport + tag: 9528ba4aac4cd70b29cfdda166e94923b61ff23b + +source-repository-package + type: git + location: https://github.com/ennocramer/floskell + tag: 8434743f1b82f9da9bb6888d1c09cc95b641ba5c + tests: true +package hsimport + tests:false + package haskell-ide-engine test-show-details: direct From 59dc5b209de7f054c0c28879769a1d9af01d6ce2 Mon Sep 17 00:00:00 2001 From: jneira Date: Tue, 3 Mar 2020 10:05:02 +0100 Subject: [PATCH 3/5] Remove unnecessary floskell source-repo-pkg --- cabal.project | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/cabal.project b/cabal.project index f627c70b6..4a49169e9 100644 --- a/cabal.project +++ b/cabal.project @@ -9,16 +9,12 @@ source-repository-package location: https://github.com/jneira/cabal-helper.git tag: ffb1f57a5ffc6b7ac3c46a9974c4420a6d2bb9b2 +-- TODO: Use released version when https://github.com/dan-t/hsimport/issues/23 is addressed source-repository-package type: git location: https://github.com/dan-t/hsimport tag: 9528ba4aac4cd70b29cfdda166e94923b61ff23b -source-repository-package - type: git - location: https://github.com/ennocramer/floskell - tag: 8434743f1b82f9da9bb6888d1c09cc95b641ba5c - tests: true package hsimport From 2c279e3e385b77612d7470b61811bb60128336b7 Mon Sep 17 00:00:00 2001 From: jneira Date: Tue, 3 Mar 2020 10:05:39 +0100 Subject: [PATCH 4/5] Add hsimport as source repo package --- cabal.project | 11 +---------- cabal.project-8.8.2 | 2 +- stack-8.4.2.yaml | 6 +++--- stack-8.4.3.yaml | 4 ++-- stack-8.4.4.yaml | 4 ++-- stack-8.6.4.yaml | 6 +++--- stack-8.6.5.yaml | 5 +++-- stack-8.8.1.yaml | 5 ++--- stack-8.8.2.yaml | 5 ++--- stack.yaml | 7 +++---- 10 files changed, 22 insertions(+), 33 deletions(-) diff --git a/cabal.project b/cabal.project index 4a49169e9..2e077831c 100644 --- a/cabal.project +++ b/cabal.project @@ -9,17 +9,8 @@ source-repository-package location: https://github.com/jneira/cabal-helper.git tag: ffb1f57a5ffc6b7ac3c46a9974c4420a6d2bb9b2 --- TODO: Use released version when https://github.com/dan-t/hsimport/issues/23 is addressed -source-repository-package - type: git - location: https://github.com/dan-t/hsimport - tag: 9528ba4aac4cd70b29cfdda166e94923b61ff23b - tests: true -package hsimport - tests:false - package haskell-ide-engine test-show-details: direct @@ -30,4 +21,4 @@ constraints: write-ghc-environment-files: never -index-state: 2020-03-01T07:49:28Z \ No newline at end of file +index-state: 2020-03-03T21:13:56Z \ No newline at end of file diff --git a/cabal.project-8.8.2 b/cabal.project-8.8.2 index d92568a1d..cffb5319f 100644 --- a/cabal.project-8.8.2 +++ b/cabal.project-8.8.2 @@ -29,4 +29,4 @@ constraints: write-ghc-environment-files: never -index-state: 2020-03-01T07:49:28Z +index-state: 2020-03-03T21:13:56Z diff --git a/stack-8.4.2.yaml b/stack-8.4.2.yaml index cabd203c8..d57e18d53 100644 --- a/stack-8.4.2.yaml +++ b/stack-8.4.2.yaml @@ -31,12 +31,12 @@ extra-deps: - haddock-library-1.6.0 - haskell-lsp-0.20.0.0 - haskell-lsp-types-0.20.0.0 -- haskell-src-exts-1.21.1 +- haskell-src-exts-1.22.0 - haskell-src-exts-util-0.2.5 - hie-bios-0.4.0 - hlint-2.2.11 -- hoogle-5.0.17.11 -- hsimport-0.11.0 +- hoogle-5.0.17.15 +- hsimport-0.11.0@rev1 - hslogger-1.3.1.0 - invariant-0.5.3 - lens-4.18.1 diff --git a/stack-8.4.3.yaml b/stack-8.4.3.yaml index 95c1aed05..583e49946 100644 --- a/stack-8.4.3.yaml +++ b/stack-8.4.3.yaml @@ -37,11 +37,11 @@ extra-deps: - haddock-library-1.6.0 - haskell-lsp-0.20.0.0 - haskell-lsp-types-0.20.0.0 -- haskell-src-exts-1.21.1 +- haskell-src-exts-1.22.0 - haskell-src-exts-util-0.2.5 - hie-bios-0.4.0 - hlint-2.2.11 -- hoogle-5.0.17.11 +- hoogle-5.0.17.15 - hsimport-0.11.0 - hslogger-1.3.1.0 - hspec-2.7.1 diff --git a/stack-8.4.4.yaml b/stack-8.4.4.yaml index 8d6ffa54f..37419c663 100644 --- a/stack-8.4.4.yaml +++ b/stack-8.4.4.yaml @@ -30,11 +30,11 @@ extra-deps: - haddock-library-1.6.0 - haskell-lsp-0.20.0.0 - haskell-lsp-types-0.20.0.0 -- haskell-src-exts-1.21.1 +- haskell-src-exts-1.22.0 - haskell-src-exts-util-0.2.5 - hie-bios-0.4.0 - hlint-2.2.11 -- hoogle-5.0.17.11 +- hoogle-5.0.17.15 - hsimport-0.11.0 - hslogger-1.3.1.0 - invariant-0.5.3 diff --git a/stack-8.6.4.yaml b/stack-8.6.4.yaml index ca707f7e0..fda00f4fc 100644 --- a/stack-8.6.4.yaml +++ b/stack-8.6.4.yaml @@ -24,11 +24,11 @@ extra-deps: - haddock-api-2.22.0 - haskell-lsp-0.20.0.0 - haskell-lsp-types-0.20.0.0 -- haskell-src-exts-1.21.1 +- haskell-src-exts-1.22.0 - hie-bios-0.4.0 - hlint-2.2.11 -- hoogle-5.0.17.11 -- hsimport-0.11.0 +- hoogle-5.0.17.15 +- hsimport-0.11.0@rev1 - lsp-test-0.10.1.0 - monad-dijkstra-0.1.1.2@rev:1 - monad-memo-0.4.1 diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml index 0ca019c97..3f239f7cf 100644 --- a/stack-8.6.5.yaml +++ b/stack-8.6.5.yaml @@ -27,10 +27,11 @@ extra-deps: - haddock-api-2.22.0 - haskell-lsp-0.20.0.0 - haskell-lsp-types-0.20.0.0 +- haskell-src-exts-1.22.0 - hie-bios-0.4.0 - hlint-2.2.11 -- hoogle-5.0.17.11 -- hsimport-0.11.0 +- hoogle-5.0.17.15 +- hsimport-0.11.0@rev1 - indexed-profunctors-0.1 - lsp-test-0.10.1.0 - monad-dijkstra-0.1.1.2 diff --git a/stack-8.8.1.yaml b/stack-8.8.1.yaml index f8a9582a0..4c34461ad 100644 --- a/stack-8.8.1.yaml +++ b/stack-8.8.1.yaml @@ -23,11 +23,10 @@ extra-deps: - haskell-lsp-0.20.0.0 - haskell-lsp-types-0.20.0.0 - lsp-test-0.10.1.0 -- haskell-src-exts-1.21.1 - hie-bios-0.4.0 - hlint-2.2.11 -- hoogle-5.0.17.11 -- hsimport-0.11.0 +- hoogle-5.0.17.15 +- hsimport-0.11.0@rev1 - ilist-0.3.1.0 - monad-dijkstra-0.1.1.2 - ormolu-0.0.3.1 diff --git a/stack-8.8.2.yaml b/stack-8.8.2.yaml index d0e8a662d..bef19da55 100644 --- a/stack-8.8.2.yaml +++ b/stack-8.8.2.yaml @@ -28,11 +28,10 @@ extra-deps: - haskell-lsp-0.20.0.0 - haskell-lsp-types-0.20.0.0 - lsp-test-0.10.1.0 -- haskell-src-exts-1.21.1 - hie-bios-0.4.0 - hlint-2.2.11 -- hoogle-5.0.17.11 -- hsimport-0.11.0 +- hoogle-5.0.17.15 +- hsimport-0.11.0@rev1 - ilist-0.3.1.0 - monad-dijkstra-0.1.1.2 - ormolu-0.0.3.1 diff --git a/stack.yaml b/stack.yaml index 8d7f30ae1..f3ef8b777 100644 --- a/stack.yaml +++ b/stack.yaml @@ -17,20 +17,19 @@ extra-deps: - floskell-0.10.2 - ghc-lib-parser-8.8.2.20200205 - ghc-lib-parser-ex-8.8.5.3 +# - haddock-api-2.23.0 - git: https://github.com/haskell/haddock.git commit: be8b02c4e3cffe7d45b3dad0a0f071d35a274d65 subdirs: - haddock-api -# - haddock-api-2.23.0 - haddock-library-1.8.0 - haskell-lsp-0.20.0.0 - haskell-lsp-types-0.20.0.0 - lsp-test-0.10.1.0 -- haskell-src-exts-1.21.1 - hie-bios-0.4.0 - hlint-2.2.11 -- hoogle-5.0.17.11 -- hsimport-0.11.0 +- hoogle-5.0.17.15 +- hsimport-0.11.0@rev1 - ilist-0.3.1.0 - monad-dijkstra-0.1.1.2 - ormolu-0.0.3.1 From ba8ee55cdab2644fcc9415abaaff7d3dbd12e3e5 Mon Sep 17 00:00:00 2001 From: jneira Date: Thu, 5 Mar 2020 09:06:52 +0100 Subject: [PATCH 5/5] Avoid unliftio-core >= 0.2 --- cabal.project | 4 +++- cabal.project-8.8.2 | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cabal.project b/cabal.project index 2e077831c..5cda0668c 100644 --- a/cabal.project +++ b/cabal.project @@ -16,7 +16,9 @@ package haskell-ide-engine -- Match the flag settings we use in stac builds constraints: - haskell-ide-engine +pedantic + -- to avoid temporary a breaking change: https://github.com/haskell/haskell-ide-engine/issues/1680 + unliftio-core < 0.2.0.0, + haskell-ide-engine +pedantic, hie-plugin-api +pedantic write-ghc-environment-files: never diff --git a/cabal.project-8.8.2 b/cabal.project-8.8.2 index cffb5319f..4b061f363 100644 --- a/cabal.project-8.8.2 +++ b/cabal.project-8.8.2 @@ -24,7 +24,9 @@ package haskell-ide-engine -- Match the flag settings we use in stac builds constraints: - haskell-ide-engine +pedantic + -- to avoid temporary a breaking change: https://github.com/haskell/haskell-ide-engine/issues/1680 + unliftio-core < 0.2.0.0, + haskell-ide-engine +pedantic, hie-plugin-api +pedantic write-ghc-environment-files: never