From d388979ef2e8cd203911b03b75a25a6e2200bda1 Mon Sep 17 00:00:00 2001 From: Luke Lau Date: Sun, 3 May 2020 18:05:01 +0100 Subject: [PATCH 1/4] Get building with ghc-8.10 --- cabal.project | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cabal.project b/cabal.project index f9b8333975..80b45c1fe0 100644 --- a/cabal.project +++ b/cabal.project @@ -5,12 +5,12 @@ packages: source-repository-package type: git location: https://github.com/DanielG/cabal-helper.git - tag: a18bbb2af92e9b4337e7f930cb80754f2408bcfd + tag: 5b85a4b9e1c6463c94ffa595893ad02c9a3d2ec3 source-repository-package type: git - location: https://github.com/fendor/hie-bios.git - tag: 89d28817716a1c8df7e191f3a43c4504bc6379eb + location: https://github.com/mpickering/hie-bios.git + tag: f0abff9c855ea7e6624617df669825f3f62f723b source-repository-package type: git @@ -29,3 +29,5 @@ package ghcide write-ghc-environment-files: never index-state: 2020-05-05T17:33:00Z + +allow-newer: cabal-plan:base,floskell:base,floskell:ghc-prim,tasty-rerun:base From 4f99ff96a1856d4934e1baf06933990ef663ad9c Mon Sep 17 00:00:00 2001 From: Luke Lau Date: Wed, 6 May 2020 14:05:55 +0100 Subject: [PATCH 2/4] Update stack files --- stack-8.6.4.yaml | 6 +++--- stack-8.6.5.yaml | 6 +++--- stack-8.8.2.yaml | 6 +++--- stack-8.8.3.yaml | 6 +++--- stack.yaml | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/stack-8.6.4.yaml b/stack-8.6.4.yaml index c80170825f..d3def00706 100644 --- a/stack-8.6.4.yaml +++ b/stack-8.6.4.yaml @@ -10,7 +10,7 @@ extra-deps: - bytestring-trie-0.2.5.0 # - cabal-helper-1.0.0.0 - github: DanielG/cabal-helper - commit: a18bbb2af92e9b4337e7f930cb80754f2408bcfd + commit: 5b85a4b9e1c6463c94ffa595893ad02c9a3d2ec3 - cabal-plan-0.5.0.0 - constrained-dynamic-0.1.0.0 # - ghcide-0.1.0 @@ -27,8 +27,8 @@ extra-deps: - haskell-lsp-types-0.22.0.0 - haskell-src-exts-1.21.1 # - hie-bios-0.4.0 -- github: fendor/hie-bios - commit: 89d28817716a1c8df7e191f3a43c4504bc6379eb +- github: mpickering/hie-bios + commit: f0abff9c855ea7e6624617df669825f3f62f723b - hlint-2.2.8 - hoogle-5.0.17.11 - hsimport-0.11.0 diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml index e30622050a..b76b7e0185 100644 --- a/stack-8.6.5.yaml +++ b/stack-8.6.5.yaml @@ -9,7 +9,7 @@ extra-deps: - base-compat-0.11.0 # - cabal-helper-1.0.0.0 - github: DanielG/cabal-helper - commit: a18bbb2af92e9b4337e7f930cb80754f2408bcfd + commit: 5b85a4b9e1c6463c94ffa595893ad02c9a3d2ec3 - cabal-plan-0.6.2.0 - clock-0.7.2 - floskell-0.10.2 @@ -23,8 +23,8 @@ extra-deps: - haskell-lsp-0.22.0.0 - haskell-lsp-types-0.22.0.0 # - hie-bios-0.4.0 -- github: fendor/hie-bios - commit: 89d28817716a1c8df7e191f3a43c4504bc6379eb +- github: mpickering/hie-bios + commit: f0abff9c855ea7e6624617df669825f3f62f723b - indexed-profunctors-0.1 - lsp-test-0.10.3.0 - monad-dijkstra-0.1.1.2 diff --git a/stack-8.8.2.yaml b/stack-8.8.2.yaml index 3b4baed03e..5fb2a4404a 100644 --- a/stack-8.8.2.yaml +++ b/stack-8.8.2.yaml @@ -9,7 +9,7 @@ extra-deps: - bytestring-trie-0.2.5.0 # - cabal-helper-1.0.0.0 - github: DanielG/cabal-helper - commit: a18bbb2af92e9b4337e7f930cb80754f2408bcfd + commit: 5b85a4b9e1c6463c94ffa595893ad02c9a3d2ec3 - clock-0.7.2 - constrained-dynamic-0.1.0.0 - floskell-0.10.2 @@ -22,8 +22,8 @@ extra-deps: - haskell-lsp-types-0.22.0.0 - haskell-src-exts-1.21.1 # - hie-bios-0.4.0 -- github: fendor/hie-bios - commit: 89d28817716a1c8df7e191f3a43c4504bc6379eb +- github: mpickering/hie-bios + commit: f0abff9c855ea7e6624617df669825f3f62f723b - hlint-2.2.8 - hoogle-5.0.17.11 - hsimport-0.11.0 diff --git a/stack-8.8.3.yaml b/stack-8.8.3.yaml index f79f8f216e..266c1fa5fd 100644 --- a/stack-8.8.3.yaml +++ b/stack-8.8.3.yaml @@ -9,7 +9,7 @@ extra-deps: - bytestring-trie-0.2.5.0 # - cabal-helper-1.0.0.0 - github: DanielG/cabal-helper - commit: a18bbb2af92e9b4337e7f930cb80754f2408bcfd + commit: 5b85a4b9e1c6463c94ffa595893ad02c9a3d2ec3 - clock-0.7.2 - constrained-dynamic-0.1.0.0 - floskell-0.10.2 @@ -22,8 +22,8 @@ extra-deps: - haskell-lsp-types-0.22.0.0 - haskell-src-exts-1.21.1 # - hie-bios-0.4.0 -- github: fendor/hie-bios - commit: 89d28817716a1c8df7e191f3a43c4504bc6379eb +- github: mpickering/hie-bios + commit: f0abff9c855ea7e6624617df669825f3f62f723b - hlint-2.2.8 - hoogle-5.0.17.11 - hsimport-0.11.0 diff --git a/stack.yaml b/stack.yaml index 50f7b0d7ca..ecf1313bbd 100644 --- a/stack.yaml +++ b/stack.yaml @@ -9,7 +9,7 @@ extra-deps: - base-compat-0.11.0 # - cabal-helper-1.0.0.0 - github: DanielG/cabal-helper - commit: a18bbb2af92e9b4337e7f930cb80754f2408bcfd + commit: 5b85a4b9e1c6463c94ffa595893ad02c9a3d2ec3 - cabal-plan-0.6.2.0 - clock-0.7.2 - floskell-0.10.2 @@ -22,8 +22,8 @@ extra-deps: - haskell-lsp-0.22.0.0 - haskell-lsp-types-0.22.0.0 # - hie-bios-0.4.0 -- github: fendor/hie-bios - commit: 89d28817716a1c8df7e191f3a43c4504bc6379eb +- github: mpickering/hie-bios + commit: f0abff9c855ea7e6624617df669825f3f62f723b - indexed-profunctors-0.1 - lsp-test-0.10.3.0 - monad-dijkstra-0.1.1.2 From 221e006a8bda52b9364f26a4fcb850fe90973902 Mon Sep 17 00:00:00 2001 From: Luke Lau Date: Wed, 6 May 2020 14:29:04 +0100 Subject: [PATCH 3/4] Update cabal job to 8.10.1 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 53aca2c977..cd8b87b440 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -134,7 +134,7 @@ jobs: cabal: working_directory: ~/build docker: - - image: haskell:8.8.1 + - image: haskell:8.10.1 steps: - checkout - run: From 700e55ee7d1bb028e639ea4753711fea61efd057 Mon Sep 17 00:00:00 2001 From: Luke Lau Date: Wed, 6 May 2020 16:35:45 +0100 Subject: [PATCH 4/4] Revert "Update cabal job to 8.10.1" This reverts commit 221e006a8bda52b9364f26a4fcb850fe90973902. There's no docker image available yet --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index cd8b87b440..53aca2c977 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -134,7 +134,7 @@ jobs: cabal: working_directory: ~/build docker: - - image: haskell:8.10.1 + - image: haskell:8.8.1 steps: - checkout - run: