Skip to content

Commit 79c9626

Browse files
authored
Merge pull request #67 from jneira/stack-patched-hie-bios
Use patched version of hie-bios in stack config Update Cradle module to inform the new field `componentRoot` of `componentOptions`
2 parents 470e5d3 + 4696b18 commit 79c9626

File tree

7 files changed

+20
-8
lines changed

7 files changed

+20
-8
lines changed

src/Ide/Cradle.hs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -467,6 +467,7 @@ cabalHelperCradle file = do
467467
$ CradleSuccess
468468
ComponentOptions
469469
{ componentOptions = [file, fixImportDirs cwd "-i."]
470+
, componentRoot = cwd
470471
, componentDependencies = []
471472
}
472473
}
@@ -551,8 +552,9 @@ cabalHelperAction proj env package root fp = do
551552
return
552553
$ CradleSuccess
553554
ComponentOptions { componentOptions = ghcOptions
554-
, componentDependencies = []
555-
}
555+
, componentRoot = root
556+
, componentDependencies = []
557+
}
556558
Left err -> return
557559
$ CradleFail
558560
$ CradleError

stack-8.6.4.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ extra-deps:
2626
- haskell-lsp-0.21.0.0
2727
- haskell-lsp-types-0.21.0.0
2828
- haskell-src-exts-1.21.1
29-
- hie-bios-0.4.0
29+
# - hie-bios-0.4.0
30+
- github: fendor/hie-bios
31+
commit: d5b7fc9bb3025b1d4d2ac9c48b588faf18dfce99
3032
- hlint-2.2.8
3133
- hoogle-5.0.17.11
3234
- hsimport-0.11.0

stack-8.6.5.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ extra-deps:
2020
- haddock-library-1.8.0
2121
- haskell-lsp-0.21.0.0
2222
- haskell-lsp-types-0.21.0.0
23-
- hie-bios-0.4.0
23+
# - hie-bios-0.4.0
24+
- github: fendor/hie-bios
25+
commit: d5b7fc9bb3025b1d4d2ac9c48b588faf18dfce99
2426
- indexed-profunctors-0.1
2527
- lsp-test-0.10.2.0
2628
- monad-dijkstra-0.1.1.2

stack-8.8.2.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ extra-deps:
2020
- haskell-lsp-0.21.0.0
2121
- haskell-lsp-types-0.21.0.0
2222
- haskell-src-exts-1.21.1
23-
- hie-bios-0.4.0
23+
# - hie-bios-0.4.0
24+
- github: fendor/hie-bios
25+
commit: d5b7fc9bb3025b1d4d2ac9c48b588faf18dfce99
2426
- hlint-2.2.8
2527
- hoogle-5.0.17.11
2628
- hsimport-0.11.0

stack-8.8.3.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ extra-deps:
2020
- haskell-lsp-0.21.0.0
2121
- haskell-lsp-types-0.21.0.0
2222
- haskell-src-exts-1.21.1
23-
- hie-bios-0.4.0
23+
# - hie-bios-0.4.0
24+
- github: fendor/hie-bios
25+
commit: d5b7fc9bb3025b1d4d2ac9c48b588faf18dfce99
2426
- hlint-2.2.8
2527
- hoogle-5.0.17.11
2628
- hsimport-0.11.0

stack.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ extra-deps:
2020
- haddock-library-1.8.0
2121
- haskell-lsp-0.21.0.0
2222
- haskell-lsp-types-0.21.0.0
23-
- hie-bios-0.4.0
23+
# - hie-bios-0.4.0
24+
- github: fendor/hie-bios
25+
commit: d5b7fc9bb3025b1d4d2ac9c48b588faf18dfce99
2426
- indexed-profunctors-0.1
2527
- lsp-test-0.10.2.0
2628
- monad-dijkstra-0.1.1.2

0 commit comments

Comments
 (0)