Add (= version) & remove redundant dune.

Co-Authored-By: Kate <[email protected]>
Psi-Prod · Jan 11, 2023 · 1fffc25 · 1fffc25
1 parent 11f81aa
commit 1fffc25
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 30 deletions.
diff --git a/dune-project b/dune-project
@@ -1,4 +1,4 @@
-(lang dune 2.9)
+(lang dune 3.0)
 
 (version 0.1)
 
@@ -23,8 +23,6 @@
  (description
   "Mehari is a cross-platform library for building Gemini servers.\nIt fully implements the Gemini protocol specification.\nIt takes heavy inspiration from Dream, a tidy, feature-complete Web framework.")
  (depends
-  (dune
-   (>= 3.0))
   (ocaml
    (>= 4.14))
   (conan-database
@@ -50,7 +48,8 @@
  (name mehari-mirage)
  (synopsis "Mehari IO implementation for MirageOS")
  (depends
-  mehari
+  (mehari
+   (= version))
   (ipaddr
    (>= 5.3.1))
   (lwt
@@ -70,8 +69,10 @@
  (name mehari-lwt-unix)
  (synopsis "Mehari IO implementation using Lwt and Unix bindings")
  (depends
-  mehari
-  mehari-mirage
+  (mehari
+   (= version))
+  (mehari-mirage
+   (= version))
   (lwt
    (>= 5.6.1))
   (lwt_ppx
@@ -91,7 +92,8 @@
  (depends
   (ocaml
    (>= 5.0.0))
-  mehari
+  (mehari
+   (= version))
   (eio
    (>= 0.7))
   (mirage-clock-unix
@@ -111,7 +113,9 @@
  (depends
   (ocaml
    (>= 5.0.0))
-  mehari
-  mehari-eio
+  (mehari
+   (= version))
+  (mehari-eio
+   (= version))
   (eio
    (>= 0.7))))
diff --git a/mehari-eio-unix.opam b/mehari-eio-unix.opam
@@ -8,10 +8,10 @@ license: "LGPL-3.0-or-later"
 homepage: "https://github.com/Psi-Prod/Mehari"
 bug-reports: "https://github.com/Psi-Prod/Mehari/issues"
 depends: [
-  "dune" {>= "2.9"}
+  "dune" {>= "3.0"}
   "ocaml" {>= "5.0.0"}
-  "mehari"
-  "mehari-eio"
+  "mehari" {= "version"}
+  "mehari-eio" {= "version"}
   "eio" {>= "0.7"}
   "odoc" {with-doc}
 ]
@@ -24,11 +24,9 @@ build: [
     name
     "-j"
     jobs
-    "--promote-install-files=false"
     "@install"
     "@runtest" {with-test}
     "@doc" {with-doc}
   ]
-  ["dune" "install" "-p" name "--create-install-files" name]
 ]
 dev-repo: "git+https://github.com/Psi-Prod/Mehari.git"
diff --git a/mehari-eio.opam b/mehari-eio.opam
@@ -8,9 +8,9 @@ license: "LGPL-3.0-or-later"
 homepage: "https://github.com/Psi-Prod/Mehari"
 bug-reports: "https://github.com/Psi-Prod/Mehari/issues"
 depends: [
-  "dune" {>= "2.9"}
+  "dune" {>= "3.0"}
   "ocaml" {>= "5.0.0"}
-  "mehari"
+  "mehari" {= "version"}
   "eio" {>= "0.7"}
   "mirage-clock-unix" {>= "4.2.0"}
   "logs" {>= "0.7.0"}
@@ -28,11 +28,9 @@ build: [
     name
     "-j"
     jobs
-    "--promote-install-files=false"
     "@install"
     "@runtest" {with-test}
     "@doc" {with-doc}
   ]
-  ["dune" "install" "-p" name "--create-install-files" name]
 ]
 dev-repo: "git+https://github.com/Psi-Prod/Mehari.git"
diff --git a/mehari-lwt-unix.opam b/mehari-lwt-unix.opam
@@ -8,9 +8,9 @@ license: "LGPL-3.0-or-later"
 homepage: "https://github.com/Psi-Prod/Mehari"
 bug-reports: "https://github.com/Psi-Prod/Mehari/issues"
 depends: [
-  "dune" {>= "2.9"}
-  "mehari"
-  "mehari-mirage"
+  "dune" {>= "3.0"}
+  "mehari" {= "version"}
+  "mehari-mirage" {= "version"}
   "lwt" {>= "5.6.1"}
   "lwt_ppx" {>= "2.1.0"}
   "mirage-clock-unix" {>= "4.2.0"}
@@ -28,11 +28,9 @@ build: [
     name
     "-j"
     jobs
-    "--promote-install-files=false"
     "@install"
     "@runtest" {with-test}
     "@doc" {with-doc}
   ]
-  ["dune" "install" "-p" name "--create-install-files" name]
 ]
 dev-repo: "git+https://github.com/Psi-Prod/Mehari.git"
diff --git a/mehari-mirage.opam b/mehari-mirage.opam
@@ -8,8 +8,8 @@ license: "LGPL-3.0-or-later"
 homepage: "https://github.com/Psi-Prod/Mehari"
 bug-reports: "https://github.com/Psi-Prod/Mehari/issues"
 depends: [
-  "dune" {>= "2.9"}
-  "mehari"
+  "dune" {>= "3.0"}
+  "mehari" {= "version"}
   "ipaddr" {>= "5.3.1"}
   "lwt" {>= "5.6.1"}
   "lwt_ppx" {>= "2.1.0"}
@@ -28,11 +28,9 @@ build: [
     name
     "-j"
     jobs
-    "--promote-install-files=false"
     "@install"
     "@runtest" {with-test}
     "@doc" {with-doc}
   ]
-  ["dune" "install" "-p" name "--create-install-files" name]
 ]
 dev-repo: "git+https://github.com/Psi-Prod/Mehari.git"
diff --git a/mehari.opam b/mehari.opam
@@ -12,7 +12,7 @@ license: "LGPL-3.0-or-later"
 homepage: "https://github.com/Psi-Prod/Mehari"
 bug-reports: "https://github.com/Psi-Prod/Mehari/issues"
 depends: [
-  "dune" {>= "2.9" & >= "3.0"}
+  "dune" {>= "3.0"}
   "ocaml" {>= "4.14"}
   "conan-database" {>= "0.0.1"}
   "conan" {>= "0.0.1"}
@@ -34,11 +34,9 @@ build: [
     name
     "-j"
     jobs
-    "--promote-install-files=false"
     "@install"
     "@runtest" {with-test}
     "@doc" {with-doc}
   ]
-  ["dune" "install" "-p" name "--create-install-files" name]
 ]
 dev-repo: "git+https://github.com/Psi-Prod/Mehari.git"