From 4249ec376bb445b4794fc8882384e02cc64d513d Mon Sep 17 00:00:00 2001
From: Anil Madhavapeddy <anil@recoil.org>
Date: Thu, 14 Aug 2025 07:14:23 +0000
Subject: [PATCH] pkg fixes from https://github.com/ocaml/opam-repository/pull/28338 and dune fmt

---
 bin/dune | 2 +-
 dune-project | 2 +-
 lib/gpx/dune | 15 ++++++++++++++-
 lib/gpx_eio/dune | 2 +-
 lib/gpx_unix/dune | 2 +-
 mlgpx.opam | 3 ++-
 mlgpx.opam.template | 1 +
 test/dune | 7 +++++--
 8 file(s) changed, 26 insertion(s)(+), 8 deletion(s)(-)

diff --git a/bin/dune b/bin/dune
--- a/bin/dune
+++ b/bin/dune
@@ -1,4 +1,4 @@
 (executable
  (public_name mlgpx)
  (name mlgpx_cli)
- (libraries gpx gpx_eio cmdliner eio_main fmt fmt.tty fmt.cli))
\ No newline at end of file
+ (libraries gpx gpx_eio cmdliner eio_main fmt fmt.tty fmt.cli))
diff --git a/dune-project b/dune-project
--- a/dune-project
+++ b/dune-project
@@ -6,7 +6,7 @@ (generate_opam_files true)
 
 (package
  (name mlgpx)
- (depends ocaml dune xmlm ptime eio ppx_expect alcotest eio_main cmdliner fmt logs)
+ (depends ocaml dune xmlm ptime (eio (>= 1.2)) ppx_expect alcotest eio_main cmdliner fmt logs)
  (synopsis "Library and CLI for parsing and generating GPS Exchange (GPX) formats")
  (description
   "mlgpx is a streaming GPX (GPS Exchange Format) library for OCaml. It provides a portable core library using the xmlm streaming XML parser, with a separate Unix layer for file I/O operations. The library supports the complete GPX 1.1 specification including waypoints, routes, tracks, and metadata with strong type safety and validation.")
diff --git a/lib/gpx/dune b/lib/gpx/dune
--- a/lib/gpx/dune
+++ b/lib/gpx/dune
@@ -2,4 +2,17 @@ (library
  (public_name mlgpx.core)
  (name gpx)
  (libraries xmlm ptime)
- (modules gpx parser writer validate coordinate link extension waypoint metadata route track error doc))
\ No newline at end of file
+ (modules
+  gpx
+  parser
+  writer
+  validate
+  coordinate
+  link
+  extension
+  waypoint
+  metadata
+  route
+  track
+  error
+  doc))
diff --git a/lib/gpx_eio/dune b/lib/gpx_eio/dune
--- a/lib/gpx_eio/dune
+++ b/lib/gpx_eio/dune
@@ -2,4 +2,4 @@ (library
  (public_name mlgpx.eio)
  (name gpx_eio)
  (libraries eio xmlm ptime gpx)
- (modules gpx_io gpx_eio))
\ No newline at end of file
+ (modules gpx_io gpx_eio))
diff --git a/lib/gpx_unix/dune b/lib/gpx_unix/dune
--- a/lib/gpx_unix/dune
+++ b/lib/gpx_unix/dune
@@ -2,4 +2,4 @@ (library
  (public_name mlgpx.unix)
  (name gpx_unix)
  (libraries unix xmlm ptime gpx)
- (modules gpx_io gpx_unix))
\ No newline at end of file
+ (modules gpx_io gpx_unix))
diff --git a/mlgpx.opam b/mlgpx.opam
--- a/mlgpx.opam
+++ b/mlgpx.opam
@@ -14,7 +14,7 @@ "ocaml"
   "dune" {>= "3.18"}
   "xmlm"
   "ptime"
-  "eio"
+  "eio" {>= "1.2"}
   "ppx_expect"
   "alcotest"
   "eio_main"
@@ -38,3 +38,4 @@ "@doc" {with-doc}
   ]
 ]
 x-maintenance-intent: ["(latest)"]
+dev-repo: "git+https://tangled.sh/@anil.recoil.org/ocaml-gpx"
diff --git a/mlgpx.opam.template b/mlgpx.opam.template
new file mode 100644
--- /dev/null
+++ b/mlgpx.opam.template
@@ -0,0 +1,1 @@
+dev-repo: "git+https://tangled.sh/@anil.recoil.org/ocaml-gpx"
diff --git a/test/dune b/test/dune
--- a/test/dune
+++ b/test/dune
@@ -5,17 +5,20 @@ (libraries gpx gpx_unix)
  (modules test_gpx))
 
 ;; ppx_expect inline tests
+
 (library
  (name test_corpus)
  (libraries gpx)
  (inline_tests)
- (preprocess (pps ppx_expect))
+ (preprocess
+  (pps ppx_expect))
  (modules test_corpus))
 
 ;; Alcotest suite for Unix and Eio comparison
+
 (executable
  (public_name corpus_test)
  (name test_corpus_unix_eio)
  (libraries gpx gpx_unix gpx_eio alcotest eio_main)
  (optional)
- (modules test_corpus_unix_eio))
\ No newline at end of file
+ (modules test_corpus_unix_eio))

--
tangled.sh