From e9709711ac89a909da8e8656ad64763be34b6337 Mon Sep 17 00:00:00 2001 From: Avi Dessauer Date: Sat, 9 May 2020 03:05:20 -0400 Subject: [PATCH 1/4] Use implicit-hie --- cabal.project | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/cabal.project b/cabal.project index 4986846bac..54774eb726 100644 --- a/cabal.project +++ b/cabal.project @@ -9,8 +9,13 @@ source-repository-package source-repository-package type: git - location: https://github.com/mpickering/hie-bios.git - tag: 501cc337691cc9da45ff12db46d8b3af9a2a0eda + location: https://github.com/Avi-D-coder/hie-bios.git + tag: b67ebfdabe3d6801aca8f64ee8fe21fac77f24da + +source-repository-package + type: git + location: https://github.com/Avi-D-coder/implicit-hie.git + tag: e033a562a8b18878d354b91977dbcd33604ad554 source-repository-package type: git From ade8fba5aa99278451029a89901f79b1a4d0e017 Mon Sep 17 00:00:00 2001 From: Avi Dessauer Date: Sat, 9 May 2020 03:16:22 -0400 Subject: [PATCH 2/4] Use implicit-hie for stack --- 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, 20 insertions(+), 10 deletions(-) diff --git a/stack-8.6.4.yaml b/stack-8.6.4.yaml index 9b34fc0c25..824ddf72f8 100644 --- a/stack-8.6.4.yaml +++ b/stack-8.6.4.yaml @@ -27,8 +27,10 @@ extra-deps: - haskell-lsp-types-0.22.0.0 - haskell-src-exts-1.21.1 # - hie-bios-0.4.0 -- github: mpickering/hie-bios - commit: 501cc337691cc9da45ff12db46d8b3af9a2a0eda +- github: Avi-D-coder/hie-bios + commit: b67ebfdabe3d6801aca8f64ee8fe21fac77f24da +- github: Avi-D-coder/implicit-hie + commit: e033a562a8b18878d354b91977dbcd33604ad554 - 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 9cbcd4b061..7dad2400f2 100644 --- a/stack-8.6.5.yaml +++ b/stack-8.6.5.yaml @@ -23,8 +23,10 @@ extra-deps: - haskell-lsp-0.22.0.0 - haskell-lsp-types-0.22.0.0 # - hie-bios-0.4.0 -- github: mpickering/hie-bios - commit: f0abff9c855ea7e6624617df669825f3f62f723b +- github: Avi-D-coder/hie-bios + commit: b67ebfdabe3d6801aca8f64ee8fe21fac77f24da +- github: Avi-D-coder/implicit-hie + commit: e033a562a8b18878d354b91977dbcd33604ad554 - 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 e8370f31a3..75cffad71d 100644 --- a/stack-8.8.2.yaml +++ b/stack-8.8.2.yaml @@ -22,8 +22,10 @@ extra-deps: - haskell-lsp-types-0.22.0.0 - haskell-src-exts-1.21.1 # - hie-bios-0.4.0 -- github: mpickering/hie-bios - commit: 501cc337691cc9da45ff12db46d8b3af9a2a0eda +- github: Avi-D-coder/hie-bios + commit: b67ebfdabe3d6801aca8f64ee8fe21fac77f24da +- github: Avi-D-coder/implicit-hie + commit: e033a562a8b18878d354b91977dbcd33604ad554 - 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 a61da1952f..e9f4b5f042 100644 --- a/stack-8.8.3.yaml +++ b/stack-8.8.3.yaml @@ -22,8 +22,10 @@ extra-deps: - haskell-lsp-types-0.22.0.0 - haskell-src-exts-1.21.1 # - hie-bios-0.4.0 -- github: mpickering/hie-bios - commit: 501cc337691cc9da45ff12db46d8b3af9a2a0eda +- github: Avi-D-coder/hie-bios + commit: b67ebfdabe3d6801aca8f64ee8fe21fac77f24da +- github: Avi-D-coder/implicit-hie + commit: e033a562a8b18878d354b91977dbcd33604ad554 - hlint-2.2.8 - hoogle-5.0.17.11 - hsimport-0.11.0 diff --git a/stack.yaml b/stack.yaml index e69801bdb5..e951329139 100644 --- a/stack.yaml +++ b/stack.yaml @@ -22,8 +22,10 @@ extra-deps: - haskell-lsp-0.22.0.0 - haskell-lsp-types-0.22.0.0 # - hie-bios-0.4.0 -- github: mpickering/hie-bios - commit: 501cc337691cc9da45ff12db46d8b3af9a2a0eda +- github: Avi-D-coder/hie-bios + commit: b67ebfdabe3d6801aca8f64ee8fe21fac77f24da +- github: Avi-D-coder/implicit-hie + commit: e033a562a8b18878d354b91977dbcd33604ad554 - indexed-profunctors-0.1 - lsp-test-0.10.3.0 - monad-dijkstra-0.1.1.2 From 500eb012e230db25f76e864f43e6e490375bc563 Mon Sep 17 00:00:00 2001 From: Avi Dessauer Date: Sat, 9 May 2020 19:08:43 -0400 Subject: [PATCH 3/4] Update implicit-hie --- cabal.project | 2 +- stack-8.6.4.yaml | 4 ++-- stack-8.6.5.yaml | 4 ++-- stack-8.8.2.yaml | 4 ++-- stack-8.8.3.yaml | 4 ++-- stack.yaml | 31 +++++++++++++------------------ 6 files changed, 22 insertions(+), 27 deletions(-) diff --git a/cabal.project b/cabal.project index 54774eb726..234f1334cc 100644 --- a/cabal.project +++ b/cabal.project @@ -15,7 +15,7 @@ source-repository-package source-repository-package type: git location: https://github.com/Avi-D-coder/implicit-hie.git - tag: e033a562a8b18878d354b91977dbcd33604ad554 + tag: 2de791efafb25e020061f9cb808dda0bfb3755ae source-repository-package type: git diff --git a/stack-8.6.4.yaml b/stack-8.6.4.yaml index 824ddf72f8..365586130f 100644 --- a/stack-8.6.4.yaml +++ b/stack-8.6.4.yaml @@ -28,9 +28,9 @@ extra-deps: - haskell-src-exts-1.21.1 # - hie-bios-0.4.0 - github: Avi-D-coder/hie-bios - commit: b67ebfdabe3d6801aca8f64ee8fe21fac77f24da + commit: 6d95e0343a35b44f6aa7600af46b0c3d48ffd3da - github: Avi-D-coder/implicit-hie - commit: e033a562a8b18878d354b91977dbcd33604ad554 + commit: a71069c2baf6fb0a3fd3298ad59bd7d79afebe49 - 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 7dad2400f2..3cda1750b3 100644 --- a/stack-8.6.5.yaml +++ b/stack-8.6.5.yaml @@ -24,9 +24,9 @@ extra-deps: - haskell-lsp-types-0.22.0.0 # - hie-bios-0.4.0 - github: Avi-D-coder/hie-bios - commit: b67ebfdabe3d6801aca8f64ee8fe21fac77f24da + commit: 6d95e0343a35b44f6aa7600af46b0c3d48ffd3da - github: Avi-D-coder/implicit-hie - commit: e033a562a8b18878d354b91977dbcd33604ad554 + commit: a71069c2baf6fb0a3fd3298ad59bd7d79afebe49 - 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 75cffad71d..fddffe39e7 100644 --- a/stack-8.8.2.yaml +++ b/stack-8.8.2.yaml @@ -23,9 +23,9 @@ extra-deps: - haskell-src-exts-1.21.1 # - hie-bios-0.4.0 - github: Avi-D-coder/hie-bios - commit: b67ebfdabe3d6801aca8f64ee8fe21fac77f24da + commit: 6d95e0343a35b44f6aa7600af46b0c3d48ffd3da - github: Avi-D-coder/implicit-hie - commit: e033a562a8b18878d354b91977dbcd33604ad554 + commit: a71069c2baf6fb0a3fd3298ad59bd7d79afebe49 - 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 e9f4b5f042..3998811ddd 100644 --- a/stack-8.8.3.yaml +++ b/stack-8.8.3.yaml @@ -23,9 +23,9 @@ extra-deps: - haskell-src-exts-1.21.1 # - hie-bios-0.4.0 - github: Avi-D-coder/hie-bios - commit: b67ebfdabe3d6801aca8f64ee8fe21fac77f24da + commit: 6d95e0343a35b44f6aa7600af46b0c3d48ffd3da - github: Avi-D-coder/implicit-hie - commit: e033a562a8b18878d354b91977dbcd33604ad554 + commit: a71069c2baf6fb0a3fd3298ad59bd7d79afebe49 - hlint-2.2.8 - hoogle-5.0.17.11 - hsimport-0.11.0 diff --git a/stack.yaml b/stack.yaml index e951329139..3998811ddd 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,19 +1,18 @@ -resolver: lts-14.22 +resolver: lts-15.10 packages: - . - ./ghcide/ extra-deps: -- ansi-terminal-0.10.2 -- base-compat-0.11.0 +- apply-refact-0.7.0.0 +- bytestring-trie-0.2.5.0 # - cabal-helper-1.0.0.0 - github: DanielG/cabal-helper commit: 5b85a4b9e1c6463c94ffa595893ad02c9a3d2ec3 -- cabal-plan-0.6.2.0 - clock-0.7.2 +- constrained-dynamic-0.1.0.0 - floskell-0.10.2 -- fuzzy-0.1.0.0 # - ghcide-0.1.0 - ghc-check-0.1.0.3 - ghc-lib-parser-8.10.1.20200412 @@ -21,28 +20,24 @@ extra-deps: - haddock-library-1.8.0 - haskell-lsp-0.22.0.0 - haskell-lsp-types-0.22.0.0 +- haskell-src-exts-1.21.1 # - hie-bios-0.4.0 - github: Avi-D-coder/hie-bios - commit: b67ebfdabe3d6801aca8f64ee8fe21fac77f24da + commit: 6d95e0343a35b44f6aa7600af46b0c3d48ffd3da - github: Avi-D-coder/implicit-hie - commit: e033a562a8b18878d354b91977dbcd33604ad554 -- indexed-profunctors-0.1 + commit: a71069c2baf6fb0a3fd3298ad59bd7d79afebe49 +- hlint-2.2.8 +- hoogle-5.0.17.11 +- hsimport-0.11.0 +- ilist-0.3.1.0 - lsp-test-0.10.3.0 - monad-dijkstra-0.1.1.2 -- opentelemetry-0.3.0 -- optics-core-0.2 -- optparse-applicative-0.15.1.0 +- opentelemetry-0.3.2 - ormolu-0.0.5.0 -- parser-combinators-1.2.1 -- regex-base-0.94.0.0 -- regex-pcre-builtin-0.95.1.1.8.43 -- regex-tdfa-1.3.1.0 -- semialign-1.1 +- semigroups-0.18.5 - github: wz1000/shake commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef -- tasty-rerun-1.1.17 - temporary-1.2.1.1 -- topograph-1 flags: haskell-language-server: From a2e502b7a23b13236f596f86939fb8e90a5f03e0 Mon Sep 17 00:00:00 2001 From: Avi Dessauer Date: Sat, 9 May 2020 19:29:43 -0400 Subject: [PATCH 4/4] Fix cabal.project implicit-hie commit --- cabal.project | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cabal.project b/cabal.project index 234f1334cc..a19eab270a 100644 --- a/cabal.project +++ b/cabal.project @@ -10,7 +10,7 @@ source-repository-package source-repository-package type: git location: https://github.com/Avi-D-coder/hie-bios.git - tag: b67ebfdabe3d6801aca8f64ee8fe21fac77f24da + tag: 63e6e56ecfd726829f0b3fdc626de3796feaa05a source-repository-package type: git