[Git][haskell-team/DHG_packages][master] cryptol: Upgrading from 2.8.0 to 3.0.0
Clint Adams (@clint)
gitlab at salsa.debian.org
Tue Oct 24 13:42:15 BST 2023
Clint Adams pushed to branch master at Debian Haskell Group / DHG_packages
Commits:
601c74bd by Clint Adams at 2023-10-24T08:41:39-04:00
cryptol: Upgrading from 2.8.0 to 3.0.0
- - - - -
3 changed files:
- p/haskell-cryptol/debian/changelog
- p/haskell-cryptol/debian/control
- p/haskell-cryptol/debian/patches/newer-deps
Changes:
=====================================
p/haskell-cryptol/debian/changelog
=====================================
@@ -1,9 +1,12 @@
-haskell-cryptol (2.8.0-2) UNRELEASED; urgency=medium
+haskell-cryptol (3.0.0-1) unstable; urgency=medium
- * Declare compliance with Debian policy 4.6.1
+ [ Ilias Tsitsimpis ]
* Declare compliance with Debian policy 4.6.2
- -- Ilias Tsitsimpis <iliastsi at debian.org> Tue, 28 Jun 2022 15:32:11 +0300
+ [ Clint Adams ]
+ * New upstream version.
+
+ -- Clint Adams <clint at debian.org> Tue, 24 Oct 2023 08:37:44 -0400
haskell-cryptol (2.8.0-1) unstable; urgency=medium
=====================================
p/haskell-cryptol/debian/control
=====================================
@@ -13,9 +13,22 @@ Build-Depends:
haskell-devscripts (>= 0.13),
libghc-graphscc-dev (>= 1.0.4),
libghc-graphscc-prof,
+ libghc-memotrie-dev (>= 0.6),
+ libghc-memotrie-dev (<< 0.7),
+ libghc-memotrie-prof,
+ libghc-arithmoi-dev (>= 0.12),
+ libghc-arithmoi-prof,
+ libghc-async-dev (>= 2.2),
+ libghc-async-dev (<< 2.3),
+ libghc-async-prof,
libghc-base-compat-dev (>= 0.6),
- libghc-base-compat-dev (<< 0.12),
+ libghc-base-compat-dev (<< 0.13),
libghc-base-compat-prof,
+ libghc-bv-sized-dev (>= 1.0),
+ libghc-bv-sized-dev (<< 1.1),
+ libghc-bv-sized-prof,
+ libghc-criterion-measurement-dev,
+ libghc-criterion-measurement-prof,
libghc-cryptohash-sha1-dev (>= 0.11),
libghc-cryptohash-sha1-dev (<< 0.12),
libghc-cryptohash-sha1-prof,
@@ -25,7 +38,17 @@ Build-Depends:
libghc-graphscc-prof,
libghc-heredoc-dev (>= 0.2),
libghc-heredoc-prof,
- libghc-monad-control-dev,
+ libghc-hgmp-dev,
+ libghc-hgmp-prof,
+ libghc-language-c99-dev,
+ libghc-language-c99-prof,
+ libghc-language-c99-simple-dev,
+ libghc-language-c99-simple-prof,
+ libghc-libbf-dev (>= 0.6),
+ libghc-libbf-dev (<< 0.7),
+ libghc-libbf-prof,
+ libghc-libffi-dev (>= 0.2),
+ libghc-libffi-prof,
libghc-monad-control-dev (>= 1.0),
libghc-monad-control-prof,
libghc-monadlib-dev,
@@ -33,11 +56,16 @@ Build-Depends:
libghc-monadlib-prof,
libghc-panic-dev (>= 0.3),
libghc-panic-prof,
- libghc-random-dev (>= 1.0.1),
- libghc-random-prof,
- libghc-sbv-dev (>= 8.1),
+ libghc-parameterized-utils-dev (>= 2.0.2),
+ libghc-parameterized-utils-prof,
+ libghc-pretty-show-dev,
+ libghc-pretty-show-prof,
+ libghc-prettyprinter-dev (>= 1.7.0),
+ libghc-prettyprinter-prof,
+ libghc-sbv-dev (>= 9.1),
+ libghc-sbv-dev (<< 10.3),
libghc-sbv-prof,
- libghc-simple-smt-dev (>= 0.7.1),
+ libghc-simple-smt-dev (>= 0.9.7),
libghc-simple-smt-prof,
libghc-strict-dev,
libghc-strict-prof,
@@ -48,27 +76,52 @@ Build-Depends:
libghc-transformers-base-prof,
alex,
happy,
+ libghc-vector-dev,
+ libghc-vector-prof,
+ libghc-what4-dev (>= 1.4),
+ libghc-what4-dev (<< 1.6),
+ libghc-what4-prof,
libghc-ansi-terminal-dev,
libghc-base-compat-dev,
libghc-blaze-html-dev,
libghc-blaze-html-prof,
+ libghc-extra-dev,
+ libghc-extra-prof,
libghc-monad-control-dev,
+ libghc-optparse-applicative-dev,
+ libghc-optparse-applicative-prof,
+ libghc-temporary-dev,
+ libghc-temporary-prof,
Build-Depends-Indep: ghc-doc,
libghc-graphscc-doc,
+ libghc-memotrie-doc,
+ libghc-arithmoi-doc,
+ libghc-async-doc,
libghc-base-compat-doc,
+ libghc-bv-sized-doc,
+ libghc-criterion-measurement-doc,
libghc-cryptohash-sha1-doc,
libghc-gitrev-doc,
libghc-graphscc-doc,
libghc-heredoc-doc,
+ libghc-hgmp-doc,
+ libghc-language-c99-doc,
+ libghc-language-c99-simple-doc,
+ libghc-libbf-doc,
+ libghc-libffi-doc,
libghc-monad-control-doc,
libghc-monadlib-doc,
libghc-panic-doc,
- libghc-random-doc,
+ libghc-parameterized-utils-doc,
+ libghc-pretty-show-doc,
+ libghc-prettyprinter-doc,
libghc-sbv-doc,
libghc-simple-smt-doc,
libghc-strict-doc,
libghc-tf-random-doc,
libghc-transformers-base-doc,
+ libghc-vector-doc,
+ libghc-what4-doc,
Standards-Version: 4.6.2
Homepage: http://www.cryptol.net/
Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git [p/haskell-cryptol]
=====================================
p/haskell-cryptol/debian/patches/newer-deps
=====================================
@@ -1,154 +1,20 @@
--- a/cryptol.cabal
+++ b/cryptol.cabal
-@@ -44,7 +44,7 @@
- Default-language:
- Haskell2010
- Build-depends: base >= 4.8 && < 5,
-- base-compat >= 0.6 && < 0.11,
-+ base-compat >= 0.6 && < 0.12,
- bytestring >= 0.10,
- array >= 0.4,
- containers >= 0.5,
---- a/src/Cryptol/Parser/NoPat.hs
-+++ b/src/Cryptol/Parser/NoPat.hs
-@@ -542,10 +542,8 @@
- instance Applicative NoPatM where pure = return; (<*>) = ap
- instance Monad NoPatM where
- return x = M (return x)
-- fail x = M (fail x)
- M x >>= k = M (x >>= unM . k)
-
--
- -- | Pick a new name, to be used when desugaring patterns.
- newName :: NoPatM PName
- newName = M $ sets $ \s -> let x = names s
---- a/src/Cryptol/Parser/ParserUtils.hs
-+++ b/src/Cryptol/Parser/ParserUtils.hs
-@@ -139,11 +139,13 @@
-
- instance Monad ParseM where
- return a = P (\_ _ s -> Right (a,s))
-- fail s = panic "[Parser] fail" [s]
- m >>= k = P (\cfg p s1 -> case unP m cfg p s1 of
- Left e -> Left e
- Right (a,s2) -> unP (k a) cfg p s2)
-
-+instance MonadFail ParseM where
-+ fail s = panic "[Parser] fail" [s]
-+
- happyError :: ParseM a
- happyError = P $ \cfg _ s ->
- case sPrevTok s of
---- a/src/Cryptol/Eval/Monad.hs
-+++ b/src/Cryptol/Eval/Monad.hs
-@@ -166,11 +166,13 @@
-
- instance Monad Eval where
- return = Ready
-- fail x = Thunk (\_ -> fail x)
- (>>=) = evalBind
- {-# INLINE return #-}
- {-# INLINE (>>=) #-}
-
-+instance MonadFail Eval where
-+ fail x = Thunk (\_ -> fail x)
-+
- instance MonadIO Eval where
- liftIO = io
-
---- a/src/Cryptol/IR/FreeVars.hs
-+++ b/src/Cryptol/IR/FreeVars.hs
-@@ -9,7 +9,6 @@
- import qualified Data.Set as Set
- import Data.Map ( Map )
- import qualified Data.Map as Map
--import Data.Semigroup (Semigroup(..))
-
- import Cryptol.TypeCheck.AST
-
---- a/src/Cryptol/ModuleSystem/Exports.hs
-+++ b/src/Cryptol/ModuleSystem/Exports.hs
-@@ -4,7 +4,6 @@
- import Data.Set(Set)
- import qualified Data.Set as Set
- import Data.Foldable(fold)
--import Data.Semigroup (Semigroup(..))
- import Control.DeepSeq(NFData)
- import GHC.Generics (Generic)
-
---- a/src/Cryptol/Utils/Patterns.hs
-+++ b/src/Cryptol/Utils/Patterns.hs
-@@ -17,10 +17,11 @@
- (<*>) = ap
-
- instance Monad Match where
-- fail _ = empty
- Match m >>= f = Match $ \no yes -> m no $ \a ->
- let Match n = f a in
- n no yes
-+instance MonadFail Match where
-+ fail _ = empty
-
- instance Alternative Match where
- empty = Match $ \no _ -> no
---- a/src/Cryptol/TypeCheck/Monad.hs
-+++ b/src/Cryptol/TypeCheck/Monad.hs
-@@ -278,9 +278,11 @@
-
- instance Monad InferM where
- return x = IM (return x)
-- fail x = IM (fail x)
- IM m >>= f = IM (m >>= unIM . f)
-
-+instance MonadFail InferM where
-+ fail x = IM (fail x)
-+
- instance MonadFix InferM where
- mfix f = IM (mfix (unIM . f))
-
-@@ -835,11 +837,10 @@
-
- instance Monad KindM where
- return x = KM (return x)
-- fail x = KM (fail x)
- KM m >>= k = KM (m >>= unKM . k)
-
--
--
-+instance MonadFail KindM where
-+ fail x = KM (fail x)
-
- {- | The arguments to this function are as follows:
-
---- a/src/Cryptol/TypeCheck/Sanity.hs
-+++ b/src/Cryptol/TypeCheck/Sanity.hs
-@@ -467,7 +467,6 @@
-
- instance Monad TcM where
- return a = TcM (return a)
-- fail x = TcM (fail x)
- TcM m >>= f = TcM (do a <- m
- let TcM m1 = f a
- m1)
---- a/src/Cryptol/Parser/NoInclude.hs
-+++ b/src/Cryptol/Parser/NoInclude.hs
-@@ -104,6 +104,8 @@
- instance Monad NoIncM where
- return x = M (return x)
- m >>= f = M (unM m >>= unM . f)
-+
-+instance MonadFail NoIncM where
- fail x = M (fail x)
-
- -- | Raise an 'IncludeFailed' error.
---- a/src/Cryptol/ModuleSystem/Monad.hs
-+++ b/src/Cryptol/ModuleSystem/Monad.hs
-@@ -325,6 +325,8 @@
-
- {-# INLINE (>>=) #-}
- m >>= f = ModuleT (unModuleT m >>= unModuleT . f)
-+
-+instance MonadFail m => MonadFail (ModuleT m) where
- {-# INLINE fail #-}
- fail = ModuleT . raise . OtherFailure
-
+@@ -74,7 +74,7 @@ library
+ prettyprinter >= 1.7.0,
+ pretty-show,
+ process >= 1.2,
+- sbv >= 9.1 && < 10.2,
++ sbv >= 9.1 && < 10.3,
+ simple-smt >= 0.9.7,
+ stm >= 2.4,
+ strict,
+@@ -85,7 +85,7 @@ library
+ mtl >= 2.2.1,
+ time >= 1.6.0.1,
+ panic >= 0.3,
+- what4 >= 1.4 && < 1.5
++ what4 >= 1.4 && < 1.6
+
+ if impl(ghc >= 9.0)
+ build-depends: ghc-bignum >= 1.0 && < 1.4
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/601c74bd97f2ade7a1b3da9c351a24dc36d8f3fd
--
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/601c74bd97f2ade7a1b3da9c351a24dc36d8f3fd
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20231024/e588863d/attachment-0001.htm>
More information about the Pkg-haskell-commits
mailing list