Merge pull request #487 from IntersectMBO/lehins/fixup-versions

Fixup package versions

.github/workflows/haskell.yml

@@ -49,6 +49,8 @@ jobs:
             ghc: "9.6.4"
           - os: macos-13
             ghc: "9.8.2"
+          - os: macos-13
+            ghc: "9.10.1"
 
     env:
       # Modify this value to "invalidate" the cabal cache.

cardano-crypto-class/cardano-crypto-class.cabal

@@ -1,6 +1,6 @@
 cabal-version:      2.2
 name:               cardano-crypto-class
-version:            2.2.1.0
+version:            2.2.0.0
 synopsis:
   Type classes abstracting over cryptography primitives for Cardano
 

cardano-crypto-class/src/Cardano/Crypto/Hash/Class.hs

@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE FlexibleContexts #-}
@@ -55,9 +54,7 @@ module Cardano.Crypto.Hash.Class
   )
 where
 
-#if ! MIN_VERSION_base(4,20,0)
-import Data.Foldable (foldl')
-#endif
+import qualified Data.Foldable as F (foldl')
 import Data.Maybe (maybeToList)
 import Data.Proxy (Proxy(..))
 import Data.Typeable (Typeable)
@@ -375,7 +372,7 @@ hash = hashWithSerialiser toCBOR
 
 {-# DEPRECATED fromHash "Use bytesToNatural . hashToBytes" #-}
 fromHash :: Hash h a -> Natural
-fromHash = foldl' f 0 . BS.unpack . hashToBytes
+fromHash = F.foldl' f 0 . BS.unpack . hashToBytes
   where
     f :: Natural -> Word8 -> Natural
     f n b = n * 256 + fromIntegral b

cardano-crypto-praos/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog for `cardano-crypto-praos`
 
-## 2.1.1.2
+## 2.1.2.1
+
+*
+
+## 2.1.2.0
 
 *
 

cardano-crypto-praos/cardano-crypto-praos.cabal

@@ -67,7 +67,7 @@ library
   build-depends:        base
                       , bytestring
                       , cardano-binary
-                      , cardano-crypto-class ^>= 2.2
+                      , cardano-crypto-class >=2.1
                       , deepseq
                       , nothunks
 

cardano-crypto-tests/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog for `cardano-crypto-tests`
 
+## 2.2.0.0
+
+*
+
+## 2.1.2.0
+
+* Add tests for BLST
+
 ## 2.1.1.0
 
 * Add benchmark for `HASH`

cardano-crypto-tests/cardano-crypto-tests.cabal

@@ -1,7 +1,7 @@
 cabal-version: 2.2
 
 name:                cardano-crypto-tests
-version:             2.2.2.0
+version:             2.2.0.0
 synopsis:            Tests for cardano-crypto-class and -praos
 description:         Tests for cardano-crypto-class and -praos
 license:             Apache-2.0

cardano-crypto-tests/src/Test/Crypto/EllipticCurve.hs

@@ -1,6 +1,5 @@
 {-# OPTIONS_GHC -Wno-orphans #-}
 
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE LambdaCase #-}
@@ -36,9 +35,7 @@ import qualified Data.ByteString.Char8 as BS8
 import qualified Data.ByteString.Base16 as Base16
 import System.IO.Unsafe (unsafePerformIO)
 import Data.Bits (shiftL)
-#if ! MIN_VERSION_base(4,20,0)
-import Data.Foldable (foldl')
-#endif
+import qualified Data.Foldable as F (foldl')
 
 tests :: TestTree
 tests =
@@ -370,7 +367,7 @@ prop_repeatedAddition a p = BLS.blsMult p (fromIntegral a) === repeatedAdd a p
     where
     repeatedAdd :: Int -> BLS.Point curve -> BLS.Point curve
     repeatedAdd scalar point =
-         foldl' BLS.blsAddOrDouble BLS.blsZero $ replicate (abs scalar) (BLS.blsCneg point (scalar < 0))
+         F.foldl' BLS.blsAddOrDouble BLS.blsZero $ replicate (abs scalar) (BLS.blsCneg point (scalar < 0))
 
 testAddNegYieldsInf :: forall curve. BLS.BLS curve
         => BLS.Point curve -> Bool

cardano-crypto-tests/src/Test/Crypto/KES.hs

@@ -1,5 +1,4 @@
 {-# LANGUAGE AllowAmbiguousTypes  #-}
-{-# LANGUAGE CPP                  #-}
 {-# LANGUAGE DataKinds            #-}
 {-# LANGUAGE DerivingVia          #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
@@ -26,9 +25,7 @@ module Test.Crypto.KES
 where
 
 import Data.Proxy (Proxy(..))
-#if ! MIN_VERSION_base(4,20,0)
-import Data.Foldable (foldl')
-#endif
+import qualified Data.Foldable as F (foldl')
 import qualified Data.ByteString as BS
 import Data.Set (Set)
 import qualified Data.Set as Set
@@ -159,7 +156,7 @@ eventTracer :: IORef [event] -> Tracer IO event
 eventTracer logVar = Tracer (\ev -> liftIO $ atomicModifyIORef' logVar (\acc -> (acc ++ [ev], ())))
 
 matchAllocLog :: [AllocEvent] -> Set WordPtr
-matchAllocLog = foldl' (flip go) Set.empty
+matchAllocLog = F.foldl' (flip go) Set.empty
   where
     go (AllocEv ptr) = Set.insert ptr
     go (FreeEv ptr) = Set.delete ptr

cardano-slotting/CHANGELOG.md

@@ -10,7 +10,7 @@
 * Add `binOpEpochNo` helper function to facilitate binary operations on
   `EpochNo`.
 * Remove numeric instances (`Num`, `Integral`, `Real`) of `EpochNo` and
-  `EpochSize` for safety. 
+  `EpochSize` for safety.
   They are still available for testing from the `testlib` as orphans.
 * New `Test.Cardano.Slotting.TreeDiff` module extracted from
   `cardano-ledger-binary`. It lives in a new public sublibrary `testlib`.

cardano-strict-containers/CHANGELOG.md

@@ -1,13 +1,10 @@
 # Changelog for `cardano-strict-containers`
 
-# next version
+# 0.1.4.0
 
+* GHC-8.10 compatibility
 * Added `takeWhileR` and `takeWhileL` to `Data.Sequence.Strict`
 
-# 0.1.3.1
-
-*
-
 # 0.1.3.0
 
 * Added `IsList` instance for `StrictSeq`

cardano-strict-containers/src/Data/FingerTree/Strict.hs

@@ -1,5 +1,4 @@
 {-# LANGUAGE BangPatterns #-}
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE DerivingStrategies #-}
 {-# LANGUAGE FlexibleInstances #-}
@@ -54,11 +53,8 @@ where
 
 import Data.FingerTree (Measured (..), ViewL (..), ViewR (..))
 import qualified Data.FingerTree as FT
-import Data.Foldable (
-#if ! MIN_VERSION_base(4,20,0)
-        foldl',
-#endif
-        toList)
+import qualified Data.Foldable as F (foldl')
+import Data.Foldable (toList)
 import Data.Unit.Strict (forceElemsToWHNF)
 import GHC.Generics (Generic)
 import NoThunks.Class (NoThunks (..), noThunksInValues)
@@ -100,7 +96,7 @@ singleton !a = SFT (FT.singleton a)
 -- | /O(n)/. Create a sequence from a finite list of elements.
 -- The opposite operation 'toList' is supplied by the 'Foldable' instance.
 fromList :: (Measured v a) => [a] -> StrictFingerTree v a
-fromList !xs = foldl' (|>) (SFT FT.empty) xs
+fromList !xs = F.foldl' (|>) (SFT FT.empty) xs
 
 -- | /O(1)/. Add an element to the left end of a sequence.
 -- Mnemonic: a triangle with the single element at the pointy end.

cardano-strict-containers/src/Data/Sequence/Strict.hs

@@ -1,5 +1,4 @@
 {-# LANGUAGE BangPatterns #-}
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE DerivingStrategies #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE PatternSynonyms #-}
@@ -71,11 +70,8 @@ import Codec.Serialise (Serialise)
 import Control.Arrow ((***))
 import Control.DeepSeq (NFData)
 import Data.Aeson (FromJSON(..), ToJSON(..))
-import Data.Foldable (
-#if ! MIN_VERSION_base(4,20,0)
-        foldl',
-#endif
-        toList)
+import qualified Data.Foldable as F (foldl')
+import Data.Foldable (toList)
 import Data.Sequence (Seq)
 import qualified Data.Sequence as Seq
 import Data.Unit.Strict (forceElemsToWHNF)
@@ -210,7 +206,7 @@ StrictSeq s |> (!x) = StrictSeq (s Seq.|> x)
 StrictSeq xs >< StrictSeq ys = StrictSeq (xs Seq.>< ys)
 
 fromList :: [a] -> StrictSeq a
-fromList !xs = foldl' (|>) empty xs
+fromList !xs = F.foldl' (|>) empty xs
 
 -- | Convert a 'Seq' into a 'StrictSeq' by forcing each element to WHNF.
 forceToStrict :: Seq a -> StrictSeq a