Fix Ocaml-CI.

.logistic/dune/extdeps/dune

@@ -1,4 +1,6 @@
 (executable
  (name extdeps)
  (optional)
+ (preprocess
+  (pps ppx_here))
  (libraries cmdliner opam-file-format sexplib shexp.process stdio))

.logistic/dune/extdeps/extdeps.ml

@@ -44,8 +44,9 @@ let () =
         let (status, stdout), stderr =
           Shexp_process.(
             run_exit_status "dune" [ "describe"; "opam-files" ]
-            |> capture [ Stdout ] |> capture [ Stderr ] |> eval)
+            |> capture [ Stdout ] |> capture [ Stderr ] |> eval ?context:None)
         in
+
         match status with
         | Exited 0 -> (
           match Sexplib.Sexp.parse stdout with
@@ -166,7 +167,6 @@ let () =
           List
             [
               Atom "rule";
-              List [ Atom "alias"; Atom "default" ];
               List [ Atom "target"; Atom (package ^ "-ios.opam") ];
               List
                 [
@@ -322,7 +322,9 @@ let () =
       | _ -> true
     in
     let rewrite path cross cross_both cross_exclude =
-      let package = String.rsplit2 ~on:'.' path |> Option.value_exn |> fst in
+      let package =
+        Option.value_exn ~here:[%here] (String.rsplit2 ~on:'.' path) |> fst
+      in
       let file = parse path in
       let rec rewrite_contents contents =
         List.map ~f:(pos rewrite_item) contents |> Result.all

dune-project

@@ -25,15 +25,23 @@
  (name timmy)
  (synopsis "Time and calendar library")
  (depends
-  (alcotest :with-test)
   base
   fmt
   (ocaml
    (>= 4.08.0))
   ppx_here
   ppx_deriving
   ptime
-  (odoc :with-doc))
+  ; Test
+  (alcotest :with-test)
+  ; Doc
+  (odoc :with-doc)
+  ; Dev
+  (cmdliner :dev)
+  (opam-file-format :dev)
+  (sexplib :dev)
+  (stdio :dev)
+  (shexp :dev))
  (depopts
   js_of_ocaml
   (schematic

dune.inc

@@ -4,7 +4,7 @@
    (progn (cat %{opam})
     (echo
      "url { src: \"git://git@gitlab.routine.co:routine/timmy#%{version:timmy}\" }")))))
-(rule (alias default) (target timmy-ios.opam)
+(rule (target timmy-ios.opam)
  (action
   (with-stdout-to %{target}
    (run %{dep:.logistic/dune/extdeps/extdeps.exe} rewrite-ios --input
@@ -33,7 +33,7 @@
    (progn (cat %{opam})
     (echo
      "url { src: \"git://git@gitlab.routine.co:routine/timmy#%{version:timmy-jsoo}\" }")))))
-(rule (alias default) (target timmy-jsoo-ios.opam)
+(rule (target timmy-jsoo-ios.opam)
  (action
   (with-stdout-to %{target}
    (run %{dep:.logistic/dune/extdeps/extdeps.exe} rewrite-ios --input
@@ -63,7 +63,7 @@
    (progn (cat %{opam})
     (echo
      "url { src: \"git://git@gitlab.routine.co:routine/timmy#%{version:timmy-lwt}\" }")))))
-(rule (alias default) (target timmy-lwt-ios.opam)
+(rule (target timmy-lwt-ios.opam)
  (action
   (with-stdout-to %{target}
    (run %{dep:.logistic/dune/extdeps/extdeps.exe} rewrite-ios --input
@@ -93,7 +93,7 @@
    (progn (cat %{opam})
     (echo
      "url { src: \"git://git@gitlab.routine.co:routine/timmy#%{version:timmy-unix}\" }")))))
-(rule (alias default) (target timmy-unix-ios.opam)
+(rule (target timmy-unix-ios.opam)
  (action
   (with-stdout-to %{target}
    (run %{dep:.logistic/dune/extdeps/extdeps.exe} rewrite-ios --input

timmy.opam

@@ -9,14 +9,19 @@ homepage: "https://github.com/mefyl/timmy"
 bug-reports: "https://github.com/mefyl/timmy/issues"
 depends: [
   "dune" {>= "3.0"}
-  "alcotest" {with-test}
   "base"
   "fmt"
   "ocaml" {>= "4.08.0"}
   "ppx_here"
   "ppx_deriving"
   "ptime"
+  "alcotest" {with-test}
   "odoc" {with-doc}
+  "cmdliner" {dev}
+  "opam-file-format" {dev}
+  "sexplib" {dev}
+  "stdio" {dev}
+  "shexp" {dev}
 ]
 depopts: [
   "js_of_ocaml"

timmy/lib/src/span.ml

@@ -26,9 +26,8 @@ module O = struct
   let ( ~- ) = Ptime.Span.neg
 
   let ( *. ) span m =
-    (span |> Ptime.Span.to_float_s) *. m
-    |> Ptime.Span.of_float_s
-    |> Base.Option.value_exn ~here:[%here]
+    let span = (span |> Ptime.Span.to_float_s) *. m |> Ptime.Span.of_float_s in
+    Base.Option.value_exn ~here:[%here] span
 
   let ( * ) span m = span *. Int.to_float m
 end