Skip to content

Commit

Permalink
Adapt cryptol-saw-core to changes from GaloisInc/cryptol#1526, Galois…
Browse files Browse the repository at this point in the history
…Inc/cryptol#1783, and GaloisInc/cryptol#1791

This is a collection of `cryptol` submodule bumps that is squashed together in
order to ensure that the SAW CI continues to pass with this commit:

* GaloisInc/cryptol#1783 bumps Cryptol's lower version bounds on `simple-smt`
  to `>=0.9.8`, which requires updating SAW's `cabal.GHC-*.config` files
  accordingly.
* GaloisInc/cryptol#1526 is brought along for the ride as part of this bump,
  but this will not pass SAW's integration tests without also including the
  bugfix from GaloisInc/cryptol#1791. As a result, I've also included
  GaloisInc/cryptol#1791.

GaloisInc/cryptol#1791 is latest of the three patchsets, so I have bumped the
`cryptol` submodule to point to the merge commit from that PR.
  • Loading branch information
RyanGlScott committed Jan 23, 2025
1 parent efce7b3 commit 68a404c
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions cabal.GHC-9.4.8.config
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ constraints: any.BoundedChan ==1.0.3.0,
any.simple-get-opt ==0.4,
any.simple-sendfile ==0.2.32,
simple-sendfile +allow-bsd -fallback,
any.simple-smt ==0.9.7,
any.simple-smt ==0.9.8,
any.smallcheck ==1.2.1.1,
any.split ==0.2.5,
any.splitmix ==0.1.0.5,
Expand Down Expand Up @@ -440,4 +440,4 @@ constraints: any.BoundedChan ==1.0.3.0,
any.zenc ==0.1.2,
any.zlib ==0.7.1.0,
any.zlib-bindings ==0.1.1.5
index-state: hackage.haskell.org 2024-08-02T09:23:27Z
index-state: hackage.haskell.org 2024-12-30T16:38:21Z
4 changes: 2 additions & 2 deletions cabal.GHC-9.6.6.config
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ constraints: any.BoundedChan ==1.0.3.0,
any.simple-get-opt ==0.4,
any.simple-sendfile ==0.2.32,
simple-sendfile +allow-bsd -fallback,
any.simple-smt ==0.9.7,
any.simple-smt ==0.9.8,
any.smallcheck ==1.2.1.1,
any.split ==0.2.5,
any.splitmix ==0.1.0.5,
Expand Down Expand Up @@ -438,4 +438,4 @@ constraints: any.BoundedChan ==1.0.3.0,
any.zenc ==0.1.2,
any.zlib ==0.7.1.0,
any.zlib-bindings ==0.1.1.5
index-state: hackage.haskell.org 2024-08-02T09:23:27Z
index-state: hackage.haskell.org 2024-12-30T16:38:21Z
4 changes: 2 additions & 2 deletions cabal.GHC-9.8.2.config
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ constraints: any.BoundedChan ==1.0.3.0,
any.simple-get-opt ==0.4,
any.simple-sendfile ==0.2.32,
simple-sendfile +allow-bsd -fallback,
any.simple-smt ==0.9.7,
any.simple-smt ==0.9.8,
any.smallcheck ==1.2.1.1,
any.split ==0.2.5,
any.splitmix ==0.1.0.5,
Expand Down Expand Up @@ -441,4 +441,4 @@ constraints: any.BoundedChan ==1.0.3.0,
any.zenc ==0.1.2,
any.zlib ==0.7.1.0,
any.zlib-bindings ==0.1.1.5
index-state: hackage.haskell.org 2024-08-02T09:23:27Z
index-state: hackage.haskell.org 2024-12-30T16:38:21Z
2 changes: 1 addition & 1 deletion deps/cryptol
Submodule cryptol updated 104 files

0 comments on commit 68a404c

Please sign in to comment.