Switch to dune pkg management

.github/workflows/deploy.yml

@@ -23,23 +23,22 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
-      - name: Setup OCaml
-        uses: ocaml/setup-ocaml@v3
+      - name: Set up dune
+        uses: ocaml-dune/setup-dune@v2
         with:
-          ocaml-compiler: 5.3.0
+          steps: install-dune enable-pkg lazy-update-depexts install-gpatch install-depexts build-deps
 
-      - run: opam install . --deps-only
-      - run: opam exec -- dune build
-      - run: opam exec -- dune exec ocaml-jp-site
+      - run: dune build
+      - run: dune exec ocaml-jp-site
 
       - name: Setup Pages
-        uses: actions/configure-pages@v5
+        uses: actions/configure-pages@v6
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v3
+        uses: actions/upload-pages-artifact@v5
         with:
           path: 'www'
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v4
+        uses: actions/deploy-pages@v5

.github/workflows/format.yml

@@ -11,16 +11,14 @@ permissions:
   contents: read
 
 jobs:
-  deploy:
+  format:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
-      - name: Setup OCaml
-        uses: ocaml/setup-ocaml@v3
-        with:
-          ocaml-compiler: 5.3.0
+      - name: Set up dune
+        uses: ocaml-dune/setup-dune@v2
 
-      - run: opam install ocamlformat.0.27.0
-      - run: opam exec -- dune build @fmt
+      - run: dune tool install ocamlformat
+      - run: dune fmt

dune-project

@@ -24,8 +24,4 @@
     yocaml_yaml
     yocaml_markdown
     yocaml_syndication
-    (ocamlformat
-      (and
-        (= 0.27.0)
-        :with-dev-setup))
     ))

dune-workspace

@@ -0,0 +1,2 @@
+(lang dune 3.22)
+(pkg enabled)

dune.lock/angstrom.0.16.1.pkg

@@ -0,0 +1,17 @@
+(version 0.16.1)
+
+(build
+ (all_platforms
+  ((action
+    (progn
+     (when %{pkg-self:dev} (run dune subst))
+     (run dune build -p %{pkg-self:name} -j %{jobs}))))))
+
+(depends
+ (all_platforms
+  (ocaml dune bigstringaf ocaml-syntax-shims)))
+
+(source
+ (fetch
+  (url https://github.com/inhabitedtype/angstrom/archive/0.16.1.tar.gz)
+  (checksum md5=a9e096b4b2b8e4e3bb17d472bbccaad0)))

dune.lock/asn1-combinators.0.3.2.pkg

@@ -0,0 +1,19 @@
+(version 0.3.2)
+
+(build
+ (all_platforms
+  ((action
+    (progn
+     (when %{pkg-self:dev} (run dune subst))
+     (run dune build -p %{pkg-self:name} -j %{jobs}))))))
+
+(depends
+ (all_platforms
+  (ocaml dune ptime)))
+
+(source
+ (fetch
+  (url
+   https://github.com/mirleft/ocaml-asn1-combinators/releases/download/v0.3.2/asn1-combinators-0.3.2.tbz)
+  (checksum
+   sha256=2b26985f6e2722073dcd9f84355bd6757e12643b5a48e30b3c07ff7cfb0d8a7f)))

dune.lock/astring.0.8.5.pkg

@@ -0,0 +1,15 @@
+(version 0.8.5)
+
+(build
+ (all_platforms
+  ((action (run ocaml pkg/pkg.ml build --pinned %{pkg-self:pinned})))))
+
+(depends
+ (all_platforms
+  (ocaml ocamlfind ocamlbuild topkg)))
+
+(source
+ (fetch
+  (url https://erratique.ch/software/astring/releases/astring-0.8.5.tbz)
+  (checksum
+   sha256=865692630c07c3ab87c66cdfc2734c0fdfc9c34a57f8e89ffec7c7d15e7a70fa)))

dune.lock/base-threads.base.pkg

@@ -0,0 +1 @@
+(version base)

dune.lock/base-unix.base.pkg

@@ -0,0 +1 @@
+(version base)

dune.lock/base.v0.17.3.pkg

@@ -0,0 +1,13 @@
+(version v0.17.3)
+
+(build
+ (all_platforms ((action (run dune build -p %{pkg-self:name} -j %{jobs})))))
+
+(depends
+ (all_platforms
+  (ocaml ocaml_intrinsics_kernel sexplib0 dune dune-configurator)))
+
+(source
+ (fetch
+  (url https://github.com/janestreet/base/archive/refs/tags/v0.17.3.tar.gz)
+  (checksum md5=2100b0ed13fecf43be86ed45c5b2cc4d)))

dune.lock/base64.3.5.2.pkg

@@ -0,0 +1,19 @@
+(version 3.5.2)
+
+(build
+ (all_platforms
+  ((action
+    (progn
+     (when %{pkg-self:dev} (run dune subst))
+     (run dune build -p %{pkg-self:name} -j %{jobs}))))))
+
+(depends
+ (all_platforms
+  (ocaml dune)))
+
+(source
+ (fetch
+  (url
+   https://github.com/mirage/ocaml-base64/releases/download/v3.5.2/base64-3.5.2.tbz)
+  (checksum
+   sha256=b3f5ce301aa72c7032ef90be2332d72ff3962922c00ee2aec6bcade187a2f59b)))

dune.lock/base_bigstring.v0.17.0.pkg

@@ -0,0 +1,15 @@
+(version v0.17.0)
+
+(build
+ (all_platforms ((action (run dune build -p %{pkg-self:name} -j %{jobs})))))
+
+(depends
+ (all_platforms
+  (ocaml base int_repr ppx_jane dune)))
+
+(source
+ (fetch
+  (url
+   https://github.com/janestreet/base_bigstring/archive/refs/tags/v0.17.0.tar.gz)
+  (checksum
+   sha256=0c77edb9db4f29797cd5c22dd07fdbe4ff668715be870b86dcc1d849730b8562)))

dune.lock/base_quickcheck.v0.17.1.pkg

@@ -0,0 +1,24 @@
+(version v0.17.1)
+
+(build
+ (all_platforms ((action (run dune build -p %{pkg-self:name} -j %{jobs})))))
+
+(depends
+ (all_platforms
+  (ocaml
+   base
+   ppx_base
+   ppx_fields_conv
+   ppx_let
+   ppx_sexp_message
+   ppx_sexp_value
+   ppxlib_jane
+   splittable_random
+   dune
+   ppxlib)))
+
+(source
+ (fetch
+  (url
+   https://github.com/janestreet/base_quickcheck/archive/refs/tags/v0.17.1.tar.gz)
+  (checksum md5=df06909b62c9e34e9e5436993d6d998d)))

dune.lock/bigstringaf.0.10.0.pkg

@@ -0,0 +1,17 @@
+(version 0.10.0)
+
+(build
+ (all_platforms
+  ((action
+    (progn
+     (when %{pkg-self:dev} (run dune subst))
+     (run dune build -p %{pkg-self:name} -j %{jobs} @install))))))
+
+(depends
+ (all_platforms
+  (dune dune-configurator ocaml)))
+
+(source
+ (fetch
+  (url https://github.com/inhabitedtype/bigstringaf/archive/0.10.0.tar.gz)
+  (checksum md5=be0a44416840852777651150757a0a3b)))

dune.lock/bin_prot.v0.17.0-1.pkg

@@ -0,0 +1,36 @@
+(version v0.17.0-1)
+
+(build
+ (all_platforms
+  ((action
+    (progn
+     (patch remove-outdated-mirage-xen-cross-compilation-rules.patch)
+     (run dune build -p %{pkg-self:name} -j %{jobs}))))))
+
+(depends
+ (all_platforms
+  (ocaml
+   base
+   ppx_compare
+   ppx_custom_printf
+   ppx_fields_conv
+   ppx_optcomp
+   ppx_sexp_conv
+   ppx_stable_witness
+   ppx_variants_conv
+   dune)))
+
+(source
+ (fetch
+  (url
+   https://github.com/janestreet/bin_prot/archive/refs/tags/v0.17.0.tar.gz)
+  (checksum
+   sha256=0e6c61aff150d19a0f89cb3e354ab36189e4bc23e28ab8bce03b6c6b6004f237)))
+
+(extra_sources
+ (remove-outdated-mirage-xen-cross-compilation-rules.patch
+  (fetch
+   (url
+    https://github.com/ocaml/opam-source-archives/raw/refs/heads/main/patches/bin_prot/remove-outdated-mirage-xen-cross-compilation-rules.patch)
+   (checksum
+    sha256=0c6fdc1a9377ae678895f237bae191ac458e507550063de143f1ee70a39ba318))))

dune.lock/bos.0.3.0.pkg

@@ -0,0 +1,15 @@
+(version 0.3.0)
+
+(build
+ (all_platforms
+  ((action (run ocaml pkg/pkg.ml build --dev-pkg %{pkg-self:dev})))))
+
+(depends
+ (all_platforms
+  (ocaml ocamlfind ocamlbuild topkg base-unix rresult astring fpath fmt logs)))
+
+(source
+ (fetch
+  (url https://erratique.ch/software/bos/releases/bos-0.3.0.tbz)
+  (checksum
+   sha512=77416442448462fb316b9b64ec213038153e82c6de030d511838a15bb13b80700598c1bcfae1c90ef766d4f42c9bf5dcf231eeff23709558246d7946962858cc)))

dune.lock/bstr.0.0.4.pkg

@@ -0,0 +1,15 @@
+(version 0.0.4)
+
+(build
+ (all_platforms ((action (run dune build -p %{pkg-self:name} -j %{jobs})))))
+
+(depends
+ (all_platforms
+  (ocaml dune)))
+
+(source
+ (fetch
+  (url
+   https://github.com/robur-coop/bstr/releases/download/v0.0.4/bstr-0.0.4.tbz)
+  (checksum
+   sha256=640836f15b2d555bdf2366f6d7783926e11598ad7e94557b167c785b255f4856)))

dune.lock/ca-certs.1.0.1.pkg

@@ -0,0 +1,23 @@
+(version 1.0.1)
+
+(build
+ (all_platforms
+  ((action
+    (progn
+     (when %{pkg-self:dev} (run dune subst))
+     (run dune build -p %{pkg-self:name} -j %{jobs} @install))))))
+
+(depends
+ (all_platforms
+  (dune bos fpath ptime logs digestif mirage-crypto x509 ocaml ohex)))
+
+(depexts
+ ((ca_root_nss)
+  (= %{os} freebsd)))
+
+(source
+ (fetch
+  (url
+   https://github.com/mirage/ca-certs/releases/download/v1.0.1/ca-certs-1.0.1.tbz)
+  (checksum
+   sha256=d3cd7c8f548baecef208d425877a811d898ec7d1d9c4bdea6f78652c7c8361cc)))

dune.lock/capitalization.v0.17.0.pkg

@@ -0,0 +1,15 @@
+(version v0.17.0)
+
+(build
+ (all_platforms ((action (run dune build -p %{pkg-self:name} -j %{jobs})))))
+
+(depends
+ (all_platforms
+  (ocaml base ppx_base dune)))
+
+(source
+ (fetch
+  (url
+   https://github.com/janestreet/capitalization/archive/refs/tags/v0.17.0.tar.gz)
+  (checksum
+   sha256=f71d45ec929c9fc9b08e07723c15b6663b0143c4465b5d93038f653258cd5c6f)))

dune.lock/cmarkit.0.4.0.pkg

@@ -0,0 +1,38 @@
+(version 0.4.0)
+
+(build
+ (all_platforms
+  ((action
+    (progn
+     (run
+      ocaml
+      pkg/pkg.ml
+      build
+      --dev-pkg
+      %{pkg-self:dev}
+      --with-cmdliner
+      %{pkg:cmdliner:installed})
+     (when
+      %{pkg:cmdliner:installed}
+      (run
+       cmdliner
+       install
+       tool-support
+       --update-opam-install=%{pkg-self:name}.install
+       (when
+        (catch_undefined_var %{pkg:ocaml:native} false)
+        _build/src/tool/cmarkit_main.native:cmarkit)
+       (when
+        (catch_undefined_var (not %{pkg:ocaml:native}) false)
+        _build/src/tool/cmarkit_main.byte:cmarkit)
+       _build/cmdliner-install)))))))
+
+(depends
+ (all_platforms
+  (ocaml ocamlfind ocamlbuild topkg cmdliner)))
+
+(source
+ (fetch
+  (url https://erratique.ch/software/cmarkit/releases/cmarkit-0.4.0.tbz)
+  (checksum
+   sha512=4f0be18c1a16265710d20b85e48b3f8d8632dd708f413264f2a3b7653a860fd80440b81dc40f5ec63d63411705ae389bb07bdb74365e277bec24895b44ba8a0a)))

dune.lock/cmdliner.2.1.1.pkg

@@ -0,0 +1,32 @@
+(version 2.1.1)
+
+(install
+ (all_platforms
+  (progn
+   (run
+    %{make}
+    install
+    BINDIR=%{pkg-self:bin}
+    LIBDIR=%{pkg-self:lib}
+    DOCDIR=%{pkg-self:doc}
+    SHAREDIR=%{share}
+    MANDIR=%{man})
+   (run
+    %{make}
+    install-doc
+    LIBDIR=%{pkg-self:lib}
+    DOCDIR=%{pkg-self:doc}
+    SHAREDIR=%{share}
+    MANDIR=%{man}))))
+
+(build
+ (all_platforms ((action (run %{make} all PREFIX=%{prefix})))))
+
+(depends
+ (all_platforms (ocaml)))
+
+(source
+ (fetch
+  (url https://erratique.ch/software/cmdliner/releases/cmdliner-2.1.1.tbz)
+  (checksum
+   sha512=cdc338ae2e56a72b7c75dae9564c57cca4e1fbfac454aabbf8303fcb612346284aede5984dfde7e8a7a496cc870bbd57ddf28cab3a38667279b31657f85c15dd)))