Skip to content

Commit 23b62e9

Browse files
martijnbastiaanalex-mckenna
authored andcommitted
Bump dependency versions (#1949)
Related: commercialhaskell/stackage#6217 (cherry picked from commit 7267499)
1 parent 43d704c commit 23b62e9

File tree

7 files changed

+27
-11
lines changed

7 files changed

+27
-11
lines changed

cabal.project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ write-ghc-environment-files: always
1616
-- index state, to go along with the cabal.project.freeze file. update the index
1717
-- state by running `cabal update` twice and looking at the index state it
1818
-- displays to you (as the second update will be a no-op)
19-
index-state: 2021-06-21T10:46:43Z
19+
index-state: 2021-10-11T13:58:48Z
2020

2121
-- For some reason the `clash-testsuite` executable fails to run without
2222
-- this, as it cannot find the related library...

clash-cosim/Setup.hs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ import Text.Printf (printf)
4545
import qualified Data.Text.Lazy as TL
4646
import qualified Data.Text.Lazy.Encoding as TL
4747

48+
#if MIN_VERSION_aeson(2,0,0)
49+
import qualified Data.Aeson.KeyMap as KM
50+
#endif
4851

4952
__COSIM_MAX_NUMBER_OF_ARGUMENTS__ = 16
5053
__COSIM_MAX_NUMBER_OF_CLOCKS__ = 1
@@ -192,7 +195,11 @@ blackboxObject
192195
-- ^ templateD
193196
-> Value
194197
blackboxObject bbname type_ templateD =
198+
#if MIN_VERSION_aeson(2,0,0)
199+
Object (KM.fromList [("BlackBox", Object (KM.fromList [
200+
#else
195201
Object (fromList [("BlackBox", Object (fromList [
202+
#endif
196203
("name", String $ Text.pack bbname)
197204
, ("kind", "Declaration")
198205
, ("type", String $ Text.pack type_)

clash-ghc/clash-ghc.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ library
160160
mtl >= 2.1.1 && < 2.3,
161161
split >= 0.2.3 && < 0.3,
162162
text >= 1.2.2 && < 1.3,
163-
transformers >= 0.5.2.0 && < 0.6,
163+
transformers >= 0.5.2.0 && < 0.7,
164164
unordered-containers >= 0.2.1.0 && < 0.3,
165165

166166
clash-lib == 1.4.3,
@@ -170,7 +170,7 @@ library
170170
ghc-typelits-knownnat >= 0.6 && < 0.8,
171171
ghc-typelits-natnormalise >= 0.6 && < 0.8,
172172
deepseq >= 1.3.0.2 && < 1.5,
173-
time >= 1.4.0.1 && < 1.12,
173+
time >= 1.4.0.1 && < 1.13,
174174
ghc-boot >= 8.4.0 && < 9.1,
175175
ghc-prim >= 0.3.1.0 && < 0.8,
176176
ghci >= 8.4.0 && < 9.1,

clash-lib/clash-lib.cabal

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ Library
135135
RecordWildCards
136136
TemplateHaskell
137137

138-
Build-depends: aeson >= 0.6.2.0 && < 1.6,
138+
Build-depends: aeson >= 0.6.2.0 && < 2.1,
139139
aeson-pretty >= 0.8 && < 0.9,
140140
ansi-terminal >= 0.8.0.0 && < 0.12,
141141
array,
@@ -181,8 +181,8 @@ Library
181181
terminal-size >= 0.3 && < 0.4,
182182
text >= 1.2.2 && < 1.3,
183183
text-show >= 3.7 && < 3.10,
184-
time >= 1.4.0.1 && < 1.12,
185-
transformers >= 0.5.2.0 && < 0.6,
184+
time >= 1.4.0.1 && < 1.13,
185+
transformers >= 0.5.2.0 && < 0.7,
186186
trifecta >= 1.7.1.1 && < 2.2,
187187
utf8-string >= 1.0.1 && < 1.1,
188188
vector >= 0.11 && < 1.0,

clash-lib/src/Clash/Driver/Manifest.hs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,12 +211,11 @@ instance FromJSON Manifest where
211211
<*> parseWithRead "init_behavior" v
212212
<*> parseWithRead "reset_polarity" v
213213

214-
parseWithRead :: Read a => Text -> Aeson.Object -> Parser a
215214
parseWithRead field obj = do
216215
v <- obj .:? field
217216
case readMaybe =<< v of
218217
Just a -> pure a
219-
Nothing -> fail $ "Could not read field: " <> Text.unpack field
218+
Nothing -> fail $ "Could not read field: " <> show field
220219

221220
data UnexpectedModification
222221
-- | Clash generated file was modified

clash-lib/src/Clash/Primitives/Types.hs

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@
22
Copyright : (C) 2012-2016, University of Twente,
33
2016-2017, Myrtle Software Ltd
44
2018 , Google Inc.
5+
2021 , QBayLogic B.V.
56
License : BSD2 (see the file LICENSE)
6-
Maintainer : Christiaan Baaij <christiaan.baaij@gmail.com>
7+
Maintainer : QBayLogic B.V. <devops@qbaylogic.com>
78
89
Type and instance definitions for Primitive
910
-}
1011

12+
{-# LANGUAGE CPP #-}
1113
{-# LANGUAGE DeriveAnyClass #-}
1214
{-# LANGUAGE FlexibleInstances #-}
1315
{-# LANGUAGE LambdaCase #-}
@@ -51,6 +53,10 @@ import Data.Text.Lazy (Text)
5153
import GHC.Generics (Generic)
5254
import GHC.Stack (HasCallStack)
5355

56+
#if MIN_VERSION_aeson(2,0,0)
57+
import qualified Data.Aeson.KeyMap as KeyMap
58+
#endif
59+
5460
-- | An unresolved primitive still contains pointers to files.
5561
type UnresolvedPrimitive = Primitive Text ((TemplateFormat,BlackBoxFunctionName),Maybe TemplateSource) (Maybe S.Text) (Maybe TemplateSource)
5662

@@ -227,7 +233,11 @@ data Primitive a b c d
227233

228234
instance FromJSON UnresolvedPrimitive where
229235
parseJSON (Object v) =
236+
#if MIN_VERSION_aeson(2,0,0)
237+
case KeyMap.toList v of
238+
#else
230239
case H.toList v of
240+
#endif
231241
[(conKey,Object conVal)] ->
232242
case conKey of
233243
"BlackBoxHaskell" -> do

clash-prelude/clash-prelude.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -336,8 +336,8 @@ Library
336336
th-orphans >= 0.13.1 && < 1.0,
337337
text >= 0.11.3.1 && < 1.3,
338338
text-show >= 3.7 && < 3.10,
339-
time >= 1.8 && < 1.12,
340-
transformers >= 0.5.2.0 && < 0.6,
339+
time >= 1.8 && < 1.13,
340+
transformers >= 0.5.2.0 && < 0.7,
341341
type-errors >= 0.2.0.0 && < 0.3,
342342
uniplate >= 1.6.12 && < 1.7,
343343
vector >= 0.11 && < 1.0

0 commit comments

Comments
 (0)