Skip to content

Commit 1a09250

Browse files
authored
Fix hls settings (#304)
* Various settings * Change hie.yaml to use cabal * Fix
1 parent dd6d0a4 commit 1a09250

File tree

3 files changed

+259
-13
lines changed

3 files changed

+259
-13
lines changed

cabal.project

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
packages: ./granule.cabal
22

3+
allow-newer: optparse-applicative
4+
5+
jobs: $ncpus
6+
37
source-repository-package
48
type: git
59
location: https://github.com/jackohughes/haskell-src-exts

cabal.project.freeze

Lines changed: 233 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,233 @@
1+
active-repositories: hackage.haskell.org:merge
2+
constraints: any.Diff ==1.0.2,
3+
any.Glob ==0.10.2,
4+
any.HUnit ==1.6.2.0,
5+
any.OneTuple ==0.4.2,
6+
any.Only ==0.1,
7+
any.QuickCheck ==2.16.0.0,
8+
QuickCheck -old-random +templatehaskell,
9+
any.StateVar ==1.2.2,
10+
any.adjunctions ==4.4.3,
11+
any.aeson ==2.2.3.0,
12+
aeson +ordered-keymap,
13+
any.alex ==3.5.4.0,
14+
any.ansi-terminal ==1.1.4,
15+
ansi-terminal -example,
16+
any.ansi-terminal-types ==1.1.3,
17+
any.array ==0.5.4.0,
18+
any.assoc ==1.1.1,
19+
assoc -tagged,
20+
any.async ==2.2.5,
21+
async -bench,
22+
any.attoparsec ==0.14.4,
23+
attoparsec -developer,
24+
any.base ==4.17.2.1,
25+
any.base-compat ==0.14.1,
26+
any.base-compat-batteries ==0.14.1,
27+
any.base-orphans ==0.9.3,
28+
any.bifunctors ==5.5.15,
29+
bifunctors +semigroups +tagged,
30+
any.binary ==0.8.9.1,
31+
any.binary-orphans ==1.0.5,
32+
any.bitvec ==1.1.5.0,
33+
bitvec +simd,
34+
any.blaze-builder ==0.4.4.1,
35+
any.blaze-html ==0.9.2.0,
36+
any.blaze-markup ==0.8.3.0,
37+
any.boring ==0.2.2,
38+
boring +tagged,
39+
any.bytestring ==0.11.5.3,
40+
any.call-stack ==0.4.0,
41+
any.case-insensitive ==1.2.1.0,
42+
any.cassava ==0.5.4.1,
43+
any.character-ps ==0.1,
44+
any.clock ==0.8.4,
45+
clock -llvm,
46+
any.co-log-core ==0.3.2.5,
47+
any.code-page ==0.2.1,
48+
any.colour ==2.3.6,
49+
any.comonad ==5.0.9,
50+
comonad +containers +distributive +indexed-traversable,
51+
any.concurrent-extra ==0.7.0.12,
52+
any.constraints ==0.14.2,
53+
any.containers ==0.6.7,
54+
any.contravariant ==1.5.5,
55+
contravariant +semigroups +statevar +tagged,
56+
any.control-monad-omega ==0.3.4,
57+
any.criterion ==1.6.4.1,
58+
criterion -embed-data-files -fast,
59+
any.criterion-measurement ==0.2.3.0,
60+
criterion-measurement -fast,
61+
any.data-default ==0.8.0.1,
62+
any.data-default-class ==0.2.0.0,
63+
any.data-fix ==0.3.4,
64+
any.data-ordlist ==0.4.7.0,
65+
any.deepseq ==1.4.8.0,
66+
any.dense-linear-algebra ==0.1.0.0,
67+
any.directory ==1.3.7.1,
68+
any.distributive ==0.6.2.1,
69+
distributive +semigroups +tagged,
70+
any.dlist ==1.0,
71+
dlist -werror,
72+
any.exceptions ==0.10.5,
73+
any.extra ==1.8.1,
74+
any.file-embed ==0.0.16.0,
75+
any.filemanip ==0.3.6.3,
76+
any.filepath ==1.4.2.2,
77+
any.foldable1-classes-compat ==0.1.2,
78+
foldable1-classes-compat +tagged,
79+
any.free ==5.2,
80+
any.generic-arbitrary ==1.0.1.2,
81+
any.generic-lens ==2.3.0.0,
82+
any.generic-lens-core ==2.3.0.0,
83+
any.generically ==0.1.1,
84+
any.ghc-bignum ==1.3,
85+
any.ghc-boot-th ==9.4.8,
86+
any.ghc-prim ==0.9.1,
87+
any.gitrev ==1.3.1,
88+
any.happy ==2.1.7,
89+
any.happy-lib ==2.1.7,
90+
any.hashable ==1.4.7.0,
91+
hashable -arch-native +integer-gmp -random-initial-seed,
92+
any.haskeline ==0.8.2,
93+
any.haskell-lexer ==1.2.1,
94+
any.haskell-src-exts ==1.23.1,
95+
any.hsc2hs ==0.68.10,
96+
hsc2hs -in-ghc-tree,
97+
any.hspec ==2.11.16,
98+
any.hspec-core ==2.11.16,
99+
any.hspec-discover ==2.11.16,
100+
any.hspec-expectations ==0.8.4,
101+
any.indexed-profunctors ==0.1.1.1,
102+
any.indexed-traversable ==0.1.4,
103+
any.indexed-traversable-instances ==0.1.2,
104+
any.integer-conversion ==0.1.1,
105+
any.integer-logarithms ==1.0.4,
106+
integer-logarithms -check-bounds +integer-gmp,
107+
any.invariant ==0.6.4,
108+
any.js-chart ==2.9.4.1,
109+
any.kan-extensions ==5.2.7,
110+
any.lens ==5.3.5,
111+
lens -benchmark-uniplate -dump-splices +inlining -j +test-hunit +test-properties +test-templates +trustworthy,
112+
any.lens-aeson ==1.2.3,
113+
any.libBF ==0.6.8,
114+
libBF -system-libbf,
115+
any.logict ==0.8.2.0,
116+
any.lsp ==2.7.0.1,
117+
lsp -demo,
118+
any.lsp-types ==2.3.0.1,
119+
lsp-types -force-ospath,
120+
any.math-functions ==0.3.4.4,
121+
math-functions +system-erf +system-expm1,
122+
any.microstache ==1.0.3,
123+
any.mod ==0.2.1.0,
124+
mod +semirings +vector,
125+
any.monad-memo ==0.5.4,
126+
any.mtl ==2.2.2,
127+
any.mwc-random ==0.15.2.0,
128+
mwc-random -benchpapi,
129+
any.network-uri ==2.6.4.2,
130+
any.old-locale ==1.0.0.7,
131+
any.old-time ==1.1.0.4,
132+
any.optparse-applicative ==0.19.0.0,
133+
optparse-applicative +process,
134+
any.os-string ==2.0.8,
135+
any.parallel ==3.3.0.0,
136+
any.parsec ==3.1.16.1,
137+
any.pretty ==1.1.3.6,
138+
any.prettyprinter ==1.7.1,
139+
prettyprinter -buildreadme +text,
140+
any.prettyprinter-ansi-terminal ==1.1.3,
141+
any.primitive ==0.9.1.0,
142+
any.process ==1.6.18.0,
143+
any.profunctors ==5.6.3,
144+
any.quickcheck-instances ==0.3.33,
145+
any.quickcheck-io ==0.2.0,
146+
any.random ==1.3.1,
147+
any.raw-strings-qq ==1.1,
148+
any.reflection ==2.1.9,
149+
reflection -slow +template-haskell,
150+
any.regex ==1.1.0.2,
151+
any.regex-base ==0.94.0.3,
152+
any.regex-pcre-builtin ==0.95.2.3.8.44,
153+
any.regex-tdfa ==1.3.2.5,
154+
regex-tdfa +doctest -force-o2,
155+
any.row-types ==1.0.1.2,
156+
any.rts ==1.0.2,
157+
any.safe ==0.3.21,
158+
any.safe-exceptions ==0.1.7.4,
159+
any.sbv ==9.2,
160+
any.scientific ==0.3.8.0,
161+
scientific -integer-simple,
162+
any.semialign ==1.3,
163+
semialign +semigroupoids,
164+
any.semigroupoids ==5.3.7,
165+
semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers,
166+
any.semigroups ==0.20,
167+
semigroups +binary +bytestring -bytestring-builder +containers +deepseq +hashable +tagged +template-haskell +text +transformers +unordered-containers,
168+
any.semirings ==0.7,
169+
semirings +containers +unordered-containers,
170+
any.silently ==1.2.5.4,
171+
any.some ==1.0.6,
172+
some +newtype-unsafe,
173+
any.sorted-list ==0.3.1.0,
174+
any.split ==0.2.5,
175+
any.splitmix ==0.1.3.1,
176+
splitmix -optimised-mixer,
177+
any.statistics ==0.16.4.0,
178+
statistics -benchpapi,
179+
any.stm ==2.5.1.0,
180+
any.strict ==0.5.1,
181+
any.syb ==0.7.3,
182+
any.syz ==0.2.0.0,
183+
syz +base4,
184+
any.tagged ==0.8.10,
185+
tagged +deepseq +template-haskell,
186+
any.tasty ==1.5.3,
187+
tasty +unix,
188+
any.tasty-golden ==2.3.5,
189+
tasty-golden -build-example,
190+
any.template-haskell ==2.19.0.0,
191+
any.temporary ==1.3,
192+
any.terminfo ==0.4.1.5,
193+
any.text ==2.0.2,
194+
any.text-iso8601 ==0.1.1,
195+
any.text-replace ==0.1.0.3,
196+
any.text-rope ==0.3,
197+
text-rope -debug,
198+
any.text-short ==0.1.6,
199+
text-short -asserts,
200+
any.th-abstraction ==0.5.0.0,
201+
any.th-compat ==0.1.6,
202+
any.these ==1.2.1,
203+
any.time ==1.12.2,
204+
any.time-compat ==1.9.8,
205+
any.time-locale-compat ==0.1.1.5,
206+
time-locale-compat -old-locale,
207+
any.transformers ==0.5.6.2,
208+
any.transformers-base ==0.4.6,
209+
transformers-base +orphaninstances,
210+
any.transformers-compat ==0.7.2,
211+
transformers-compat -five +five-three -four +generic-deriving +mtl -three -two,
212+
any.typed-process ==0.2.13.0,
213+
any.unbounded-delays ==0.1.1.1,
214+
any.uniplate ==1.6.13,
215+
any.unix ==2.7.3,
216+
any.unix-compat ==0.7.4.1,
217+
any.unliftio ==0.2.25.1,
218+
any.unliftio-core ==0.2.1.0,
219+
any.unordered-containers ==0.2.21,
220+
unordered-containers -debug,
221+
any.utf8-string ==1.0.2,
222+
any.uuid-types ==1.0.6,
223+
any.vector ==0.13.2.0,
224+
vector +boundschecks -internalchecks -unsafechecks -wall,
225+
any.vector-algorithms ==0.9.1.0,
226+
vector-algorithms +bench +boundschecks -internalchecks -llvm -unsafechecks,
227+
any.vector-binary-instances ==0.2.5.2,
228+
any.vector-stream ==0.1.0.1,
229+
any.vector-th-unbox ==0.2.2,
230+
any.void ==0.7.4,
231+
void -safe,
232+
any.witherable ==0.5
233+
index-state: hackage.haskell.org 2025-12-17T16:03:32Z

hie.yaml

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,24 @@
11
cradle:
2-
stack:
2+
cabal:
33
- path: "./frontend/src"
44
component: "granule:lib:frontend"
55

6+
- path: "./interpreter/src"
7+
component: "granule:lib:interpreter"
8+
9+
- path: "./runtime/src"
10+
component: "granule:lib:runtime"
11+
12+
- path: "./compiler/src"
13+
component: "granule:lib:compiler"
14+
615
- path: "./frontend/tests/hspec"
716
component: "granule:test:frontend-spec"
817

9-
- path: "./interpreter/src"
10-
component: "granule:lib:interpreter"
18+
- path: "./interpreter/tests"
19+
component: "granule:test:gr-golden"
1120

12-
- path: "./interpreter/src/Language/Granule/Interpreter.hs"
21+
- path: "./interpreter/src/Main.hs"
1322
component: "granule:exe:gr"
1423

1524
- path: "./interpreter/src/Language/Granule/Doc.hs"
@@ -21,11 +30,14 @@ cradle:
2130
- path: "./interpreter/src/Language/Granule/Interpreter/Eval.hs"
2231
component: "granule:exe:gr"
2332

24-
- path: "./server/app/Language/Granule/Server.hs"
33+
- path: "./interpreter/src/Language/Granule/Interpreter.hs"
34+
component: "granule:exe:gr"
35+
36+
- path: "./server/app/Main.hs"
2537
component: "granule:exe:grls"
2638

27-
- path: "./interpreter/tests"
28-
component: "granule:test:gr-golden"
39+
- path: "./server/app/Language/Granule/Server.hs"
40+
component: "granule:exe:grls"
2941

3042
- path: "./repl/app/Language/Granule/Main.hs"
3143
component: "granule:exe:grepl"
@@ -39,16 +51,13 @@ cradle:
3951
- path: "./repl/app/Language/Granule/ReplParser.hs"
4052
component: "granule:exe:grepl"
4153

42-
- path: "./runtime/src"
43-
component: "granule:lib:runtime"
44-
45-
- path: "./compiler/src"
46-
component: "granule:lib:compiler"
54+
- path: "./compiler/app/Main.hs"
55+
component: "granule:exe:grc"
4756

4857
- path: "./compiler/app/Language/Granule/Compiler.hs"
4958
component: "granule:exe:grc"
5059

51-
- path: "./benchmark/src/Language/Granule/Main.hs"
60+
- path: "./benchmark/src/Main.hs"
5261
component: "granule:exe:grenchmark"
5362

5463
- path: "./benchmark/src/Language/Granule/Benchmarks.hs"

0 commit comments

Comments
 (0)