Skip to content

Commit 22793e7

Browse files
Remove version bounds on local packages
1 parent f9fe650 commit 22793e7

File tree

2 files changed

+40
-26
lines changed

2 files changed

+40
-26
lines changed

grease-cli/grease-cli.cabal

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ library
131131
, grease-ppc
132132
, grease-x86
133133

134+
-- Hackage dependencies
134135
, aeson ^>= 2.2
135136
, async ^>= 2.2.5
136137
, bytestring ^>= { 0.11.5, 0.12.1 }
@@ -145,36 +146,40 @@ library
145146
, safe-exceptions ^>= 0.1.7.4
146147
, text ^>= { 2.0, 2.1 }
147148
, vector ^>= 0.13.2
148-
149149
, prettyprinter ^>= 1.7.1
150150
, parameterized-utils ^>= 2.1.10
151-
, what4 ^>= 1.6
152-
, llvm-pretty ^>= 0.12
153-
, llvm-pretty-bc-parser
154-
, crucible ^>= 0.7.1
155-
, crucible-debug ^>= 0.1
151+
152+
-- Submodules
153+
--
154+
-- No version bounds are needed, as Cabal will always choose the versions
155+
-- specified in `cabal.project`, namely, the version in the submodule.
156+
, crucible
157+
, crucible-debug
158+
, crucible-llvm
156159
, crucible-llvm-debug
157-
, crucible-llvm ^>= 0.7
158160
, crucible-llvm-syntax
159161
, crucible-macaw-debug
160-
, crucible-syntax ^>= 0.4
162+
, crucible-syntax
161163
, elf-edit
162-
, macaw-loader
163-
, macaw-loader-aarch32
164-
, macaw-loader-x86
165-
, macaw-base
166-
, macaw-symbolic
167-
, macaw-symbolic-syntax
164+
, llvm-pretty
165+
, llvm-pretty-bc-parser
168166
, macaw-aarch32
169167
, macaw-aarch32-symbolic
170168
, macaw-aarch32-syntax
169+
, macaw-base
170+
, macaw-loader
171+
, macaw-loader-aarch32
172+
, macaw-loader-x86
171173
, macaw-ppc
172174
, macaw-ppc-symbolic
173175
, macaw-ppc-syntax
176+
, macaw-symbolic
177+
, macaw-symbolic-syntax
174178
, macaw-x86
175179
, macaw-x86-symbolic
176180
, macaw-x86-syntax
177181
, stubs-common
182+
, what4
178183

179184
exposed-modules:
180185
Grease.Cli
@@ -201,21 +206,25 @@ test-suite grease-tests
201206
build-depends:
202207
grease-cli
203208
, grease
209+
210+
-- Hackage dependencies
204211
, bv-sized ^>= 1.0.6
205212
, bytestring ^>= { 0.11.5, 0.12.1 }
206213
, containers ^>= 0.6.7
207214
, directory ^>= 1.3.7.1
208-
, crucible-llvm ^>= 0.7
209215
, file-embed ^>= 0.0.16
210216
, filepath ^>= 1.4.2.2
211217
, hedgehog ^>= 1.5
212218
, hslua ^>= 2.3.1
213219
, lumberjack ^>= { 1.0, 1.1 }
214-
, macaw-base
215220
, oughta ^>= 0.2
216221
, parameterized-utils ^>= 2.1.10
217222
, prettyprinter ^>= 1.7.1
218223
, tasty ^>= 1.5.3
219224
, tasty-hedgehog ^>= 1.4.0.2
220225
, tasty-hunit ^>= 0.10.2
221226
, text ^>= { 2.0, 2.1 }
227+
228+
-- Submodules
229+
, crucible-llvm
230+
, macaw-base

grease/grease.cabal

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,9 @@ library
126126
import: shared
127127
hs-source-dirs: src
128128
build-depends:
129+
-- Hackage dependencies
129130
aeson ^>= 2.2
131+
, bv-sized ^>= 1.0.6
130132
, bytestring ^>= { 0.11.5, 0.12.1 }
131133
, containers ^>= 0.6.7
132134
, directory ^>= 1.3.7.1
@@ -140,30 +142,33 @@ library
140142
, megaparsec ^>= 9.6
141143
, mtl ^>= { 2.3.1, 2.2.2 }
142144
, panic ^>= 0.4
145+
, parameterized-utils ^>= 2.1.10
146+
, prettyprinter ^>= 1.7.1
143147
, safe-exceptions ^>= 0.1.7.4
144148
, text ^>= { 2.0, 2.1 }
145149
, time ^>= 1.12.2
146150
, transformers ^>= { 0.5.6.2, 0.6.1 }
147151
, vector ^>= 0.13.2
148152

149-
, prettyprinter ^>= 1.7.1
150-
, parameterized-utils ^>= 2.1.10
151-
, bv-sized ^>= 1.0.6
152-
, what4 ^>= 1.6
153-
, llvm-pretty ^>= 0.12
154-
, crucible ^>= 0.7.1
155-
, crucible-debug ^>= 0.1
156-
, crucible-llvm ^>= 0.7
153+
-- Submodules
154+
--
155+
-- No version bounds are needed, as Cabal will always choose the versions
156+
-- specified in `cabal.project`, namely, the version in the submodule.
157+
, crucible
158+
, crucible-debug
159+
, crucible-llvm
157160
, crucible-llvm-syntax
158-
, crucible-syntax ^>= 0.4
161+
, crucible-syntax
159162
, elf-edit
160163
, elf-edit-core-dump
161-
, macaw-loader
164+
, llvm-pretty
162165
, macaw-base
166+
, macaw-loader
163167
, macaw-symbolic
164168
, macaw-symbolic-syntax
165169
, stubs-common
166170
, stubs-wrapper
171+
, what4
167172

168173
exposed-modules:
169174
Grease.Main.Diagnostic

0 commit comments

Comments
 (0)