Using pin-depends instead of vendoring for uring

See ocaml/dune#3911. Fixes ocaml-multicore#87.
talex5 · Nov 11, 2021 · 1ab2c8c · 1ab2c8c
1 parent ff71050
commit 1ab2c8c
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git a/README.md b/README.md
@@ -85,9 +85,8 @@ opam switch create 4.12.0+domains --repositories=multicore=git+https://github.co
 Then you'll need to install this library (and `utop` if you want to try it interactively):
 
 ```
-git clone --recursive https://github.com/ocaml-multicore/eio.git
+git clone https://github.com/ocaml-multicore/eio.git
 cd eio
-opam pin -yn ./ocaml-uring
 opam pin -yn .
 opam depext -i eio_main utop		# (for opam 2.0)
 opam install eio_main utop		# (for opam 2.1)

diff --git a/dune b/dune
@@ -3,4 +3,3 @@
   (packages eio_main)
   (preludes doc/prelude.ml)
   (files README.md))
-(vendored_dirs ocaml-uring)
diff --git a/eio_linux.opam b/eio_linux.opam
@@ -38,3 +38,6 @@ build: [
   ["dune" "install" "-p" name "--create-install-files" name]
 ]
 dev-repo: "git+https://github.com/ocaml-multicore/eio.git"
+pin-depends: [
+  ["uring.dev" "git+https://github.com/ocaml-multicore/ocaml-uring.git#c12c82dc1c06e1224984295c4d5819428a72dcdb"]
+]
diff --git a/eio_linux.opam.template b/eio_linux.opam.template
@@ -0,0 +1,3 @@
+pin-depends: [
+  ["uring.dev" "git+https://github.com/ocaml-multicore/ocaml-uring.git#c12c82dc1c06e1224984295c4d5819428a72dcdb"]
+]
diff --git a/ocaml-uring b/ocaml-uring