Skip to content

Commit 562dd90

Browse files
committed
Cabal 3.4: bump to Cabal-3.4, removed VersionRangeF cases (#1016)
Cabal 3.4 removed some constructors from VersionRange that can be expressed via other constructors.
1 parent 9d4a490 commit 562dd90

File tree

3 files changed

+1
-7
lines changed

3 files changed

+1
-7
lines changed

hackage-server.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ common defaults
113113
-- other dependencies shared by most components
114114
build-depends:
115115
, aeson ^>= 1.5
116-
, Cabal ^>= 3.2.1.0
116+
, Cabal ^>= 3.4.1.0
117117
, fail ^>= 4.9.0
118118
-- we use Control.Monad.Except, introduced in mtl-2.2.1
119119
, network >= 3 && < 3.2

src/Distribution/Server/Framework/Instances.hs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,17 +91,14 @@ instance SafeCopy VersionRange where
9191
kind = extension
9292
putCopy = contain . cataVersionRange f
9393
where
94-
f AnyVersionF = putWord8 0
9594
f (ThisVersionF v) = putWord8 1 >> safePut v
9695
f (LaterVersionF v) = putWord8 2 >> safePut v
9796
f (EarlierVersionF v) = putWord8 3 >> safePut v
9897
f (OrLaterVersionF v) = putWord8 4 >> safePut v
9998
f (OrEarlierVersionF v) = putWord8 5 >> safePut v
100-
f (WildcardVersionF v) = putWord8 6 >> safePut v
10199
f (MajorBoundVersionF v) = putWord8 10 >> safePut v -- since Cabal-2.0
102100
f (UnionVersionRangesF u v) = putWord8 7 >> u >> v
103101
f (IntersectVersionRangesF u v) = putWord8 8 >> u >> v
104-
f (VersionRangeParensF v) = putWord8 9 >> v
105102
getCopy = contain getVR
106103
where
107104
getVR = do

src/Distribution/Server/Framework/MemSize.hs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -240,17 +240,14 @@ instance MemSize Version where
240240
instance MemSize VersionRange where
241241
memSize = cataVersionRange f
242242
where
243-
f AnyVersionF = memSize0
244243
f (ThisVersionF v) = memSize1 v
245244
f (LaterVersionF v) = memSize1 v
246245
f (OrLaterVersionF v) = memSize1 v
247246
f (EarlierVersionF v) = memSize1 v
248247
f (OrEarlierVersionF v) = memSize1 v
249-
f (WildcardVersionF v) = memSize1 v
250248
f (MajorBoundVersionF v) = memSize1 v
251249
f (UnionVersionRangesF u v) = memSize2 u v
252250
f (IntersectVersionRangesF u v) = memSize2 u v
253-
f (VersionRangeParensF v) = memSize1 v
254251

255252
instance MemSize PackageIdentifier where
256253
memSize (PackageIdentifier a b) = memSize2 a b

0 commit comments

Comments
 (0)