Merge pull request #8 from hannesm/update

remove stdlibrandom, update to dune
mirage · Oct 21, 2018 · 5dcadef · 5dcadef
2 parents 715807c + eb463ae
commit 5dcadef
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 39 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,7 @@ sudo: required
 env:
   global:
     - PACKAGE="mirage-random"
+    - PINS="mirage-random.dev:."
     - REVDEPS=true
   matrix:
     - OCAML_VERSION=4.04

diff --git a/README.md b/README.md
@@ -1,9 +1,7 @@
-## mirage-random -- Random signatures for MirageOS, and an implementation using stdlib
+## mirage-random -- Random signatures for MirageOS
 
 mirage-random defines [Mirage_random.S][1] and [Mirage_random.C][2]
-the signature for random-related devices for MirageOS.  It also
-provides an implementation of `C` using `Random` from the OCaml standard
-library.
+the signature for random-related devices for MirageOS.
 
 [1]: https://mirage.github.io/mirage-random/Mirage_random.S.html
 [2]: https://mirage.github.io/mirage-random/Mirage_random.C.html

diff --git a/dune-project b/dune-project
@@ -0,0 +1,2 @@
+(lang dune 1.1)
+(name mirage-random)
diff --git a/mirage-random.opam b/mirage-random.opam
@@ -1,8 +1,8 @@
-opam-version: "1.2"
+opam-version: "2.0"
 maintainer:    "[email protected]"
 homepage:      "https://github.com/mirage/mirage-random"
 bug-reports:   "https://github.com/mirage/mirage-random/issues"
-dev-repo:      "https://github.com/mirage/mirage-random.git"
+dev-repo:      "git+https://github.com/mirage/mirage-random.git"
 doc:           "https://mirage.github.io/mirage-random/"
 authors:       ["Thomas Gazagnaire" "Anil Madhavapeddy" "Gabriel Radanne"
                "Mindy Preston" "Thomas Leonard" "Nicolas Ojeda Bar"
@@ -11,13 +11,18 @@ tags:          [ "org:mirage"]
 license:       "ISC"
 
 build: [
-  [ "jbuilder" "subst" ] {pinned}
-  [ "jbuilder" "build" "-p" name "-j" jobs ]
+  [ "dune" "subst" ] {pinned}
+  [ "dune" "build" "-p" name "-j" jobs ]
 ]
 
 depends: [
-  "jbuilder" {build & >="1.0+beta9"}
+  "dune" {build & >="1.1.0"}
   "cstruct" {>= "1.9.0"}
+  "ocaml" {>= "4.04.2"}
 ]
 
-available: [ ocaml-version >= "4.04.2" ]
+synopsis: "Random-related devices for MirageOS"
+description: """
+mirage-random defines `Mirage_random.S` and `Mirage_random.C` the signature for
+random-related devices for MirageOS.
+"""
diff --git a/pkg/pkg.ml b/pkg/pkg.ml
diff --git a/src/dune b/src/dune
@@ -0,0 +1,4 @@
+(library
+  (name mirage_random)
+  (public_name mirage-random)
+  (libraries cstruct))
diff --git a/src/jbuild b/src/jbuild
diff --git a/src/stdlibrandom.ml b/src/stdlibrandom.ml
diff --git a/src/stdlibrandom.mli b/src/stdlibrandom.mli