Merge pull request #247 from hannesm/no-cs

mirage-crypto-rng-eio: declare the cstruct dependency
mirage · Oct 1, 2024 · 45095b8 · 45095b8
2 parents cc388cd + 84cfdd2
commit 45095b8
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 29 deletions.
diff --git a/.test-mirage.sh b/.test-mirage.sh
@@ -5,12 +5,11 @@ set -ex
 opam install --confirm-level=unsafe-yes "mirage>4"
 # to satisfy hardcoded version constraints in mirage, we need to be < 0.12.0
 # and "dune subst" doesn't work on these PR checkouts
-version='version: "0.11.99~dev"'
+version='version: "1.99.0~dev"'
 echo $version >> mirage-crypto-rng-mirage.opam
 echo $version >> mirage-crypto-rng.opam
 echo $version >> mirage-crypto.opam
 echo $version >> mirage-crypto-pk.opam
-opam pin add -yn mirage-random.3.99 --dev
 (mirage configure -t unix -f mirage/config.ml && gmake depend && dune build --root . mirage/dist/ && mirage/dist/crypto-test) || exit 1
 (mirage configure -t hvt -f mirage/config.ml && gmake depend && dune build --root . mirage/dist/) || exit 1
 if [ $(uname -m) = "amd64" ] || [ $(uname -m) = "x86_64" ]; then

diff --git a/mirage-crypto-rng-eio.opam b/mirage-crypto-rng-eio.opam
@@ -20,6 +20,7 @@ depends: [
   "mirage-crypto-rng" {=version}
   "duration"
   "mtime"
+  "cstruct" {>= "6.1.0"}
   "eio_main" {with-test}
   "ohex" {with-test & >= "0.2.0"}
 ]

diff --git a/rng/eio/dune b/rng/eio/dune
@@ -1,4 +1,4 @@
 (library
  (name mirage_crypto_rng_eio)
  (public_name mirage-crypto-rng-eio)
- (libraries eio logs mirage-crypto-rng duration mtime))
+ (libraries eio logs mirage-crypto-rng duration mtime cstruct))
diff --git a/tests/test_rng.ml b/tests/test_rng.ml