adjust

hannesm · Mar 9, 2019 · e9cc0a3 · e9cc0a3
1 parent bc36b1c
commit e9cc0a3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -68,20 +68,19 @@ but I've some [work-in-progress](https://github.com/hannesm/conex).
 Be aware that this is unreleased software.  Bug reports are welcome
 (pull requests as well).
 
-Get OCaml (>= 4.03.0), get opam (1.2.2),
-[aspcud](http://www.cs.uni-potsdam.de/wv/aspcud/) and
-[gmp](http://gmplib.org/) are required as well.
-If you have an older OCaml compiler, run `opam switch 4.04.2` and follow instructions.
-
-In case you have an old opam (1.2.0), you need to `opam pin add cstruct 2.4.1`.
+Get OCaml (>= 4.06.0), get opam (>= 2.0.0),
+[gmp](http://gmplib.org/) is required as well.
+If you have an older OCaml compiler, run `opam switch 4.07.1` and follow instructions.
 
 Run the following commands:
-- `opam repo add xmpp-dev https://github.com/hannesm/xmpp-opam.git`
+- `opam repo add jackline-opam https://github.com/hannesm/jackline-opam.git`
 - `opam update`
 - `opam install jackline`
 
+You can enable signature verification (using [conex](https://github.com/hannesm/conex)) for that repository by following the steps in [the README](https://github.com/hannesm/jackline-opam).
+
 Now you should have a `~/.opam/system/bin/jackline` (or
-`~/.opam/4.04.2/bin/jackline`), which should be in your `PATH` (if you
+`~/.opam/4.07.1/bin/jackline`), which should be in your `PATH` (if you
 executed ``eval `opam config env` ``).
 
 To update, simply run `opam update` followed by `opam upgrade`.  This

diff --git a/opam b/opam
@@ -1,7 +1,7 @@
-opam-version: "1.2"
+opam-version: "2.0"
 name:         "jackline"
 homepage:     "https://github.com/hannesm/jackline"
-dev-repo:     "https://github.com/hannesm/jackline.git"
+dev-repo:     "git+https://github.com/hannesm/jackline.git"
 bug-reports:  "https://github.com/hannesm/jackline/issues"
 author:       ["Hannes Mehnert <hannes@mehnert.org>"]
 maintainer:   ["Hannes Mehnert <hannes@mehnert.org>"]
@@ -13,6 +13,7 @@ build: [
 ]
 
 depends: [
+  "ocaml" {>= "4.03.0"}
   "ocamlfind" {build}
   "ocamlbuild" {build}
   "ppx_sexp_conv" {build}
@@ -25,12 +26,12 @@ depends: [
   "otr" {>= "0.2.1"}
   "astring"
   "ptime" {>= "0.8.0"}
-  "notty" {>= "0.2.0"}
+  "notty" {>= "0.2.2"}
   "sexplib"
   "hex"
   "uchar"
+  "cstruct-lwt"
   "uucp" {>= "2.0.0"}
   "uuseg" {>= "1.0.0"}
   "uutf" {>= "1.0.0"}
 ]
-available: [ ocaml-version >= "4.03.0" ]