pkg fixes from https://github.com/ocaml/opam-repository/pull/28338 and dune fmt master


+26 -8
8 changed files