From 1ab2c8c72c2602ea34d6cd623ed721656d3b4a86 Mon Sep 17 00:00:00 2001
From: Thomas Leonard <talex5@gmail.com>
Date: Wed, 3 Nov 2021 11:29:57 +0000
Subject: [PATCH] Using pin-depends instead of vendoring for uring

See https://github.com/ocaml/dune/issues/3911.

Fixes #87.
---
 .gitmodules             | 3 ---
 README.md               | 3 +--
 dune                    | 1 -
 eio_linux.opam          | 3 +++
 eio_linux.opam.template | 3 +++
 ocaml-uring             | 1 -
 6 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 100644 .gitmodules
 create mode 100644 eio_linux.opam.template
 delete mode 160000 ocaml-uring

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index cdd583b8c..000000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "ocaml-uring"]
-	path = ocaml-uring
-	url = https://github.com/ocaml-multicore/ocaml-uring.git
diff --git a/README.md b/README.md
index 4eccd7b63..534928bd4 100644
--- 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
index 487aced44..c40d271ce 100644
--- 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
index 6b182e030..27f0d48b7 100644
--- 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
new file mode 100644
index 000000000..8c961d210
--- /dev/null
+++ 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
deleted file mode 160000
index c12c82dc1..000000000
--- a/ocaml-uring
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c12c82dc1c06e1224984295c4d5819428a72dcdb