Switch to Sexplib0 instead of Sexplib

MisterDA · MisterDA · commit ffb4cb76c32c · 2025-11-04T13:17:38.000+01:00
diff --git a/dockerfile-cmd.opam b/dockerfile-cmd.opam
@@ -42,7 +42,7 @@ depends: [
   "fmt" {>= "0.8.7"}
   "logs"
   "ppx_sexp_conv" {>= "v0.9.0"}
-  "sexplib"
+  "sexplib0"
   "odoc" {with-doc}
 ]
 conflicts: [
diff --git a/dockerfile-opam.opam b/dockerfile-opam.opam
@@ -39,7 +39,7 @@ depends: [
   "fmt" {>= "0.8.7"}
   "ocaml-version" {>= "3.5.0"}
   "ppx_sexp_conv" {>= "v0.9.0"}
-  "sexplib"
+  "sexplib0"
   "alcotest" {>= "1.9.1" & with-test}
   "odoc" {with-doc}
 ]
diff --git a/dockerfile.opam b/dockerfile.opam
@@ -35,7 +35,7 @@ depends: [
   "ocaml" {>= "4.08"}
   "fmt" {>= "0.8.7"}
   "ppx_sexp_conv" {>= "v0.9.0"}
-  "sexplib"
+  "sexplib0"
   "alcotest" {>= "1.9.1" & with-test}
   "odoc" {with-doc}
 ]
diff --git a/dune-project b/dune-project
@@ -38,7 +38,7 @@
   (ocaml (>= "4.08"))
   (fmt (>= "0.8.7"))
   (ppx_sexp_conv (>= "v0.9.0"))
-  sexplib
+  sexplib0
   (alcotest (and (>= "1.9.1") :with-test)))
  (conflicts
   (result (< 1.5))
@@ -64,7 +64,7 @@
   (fmt (>= "0.8.7"))
   logs
   (ppx_sexp_conv (>= "v0.9.0"))
-  sexplib)
+  sexplib0)
  (conflicts
   (result (< 1.5))
   (rresult (< 0.7.0)))
@@ -86,7 +86,7 @@
   (fmt (>= "0.8.7"))
   (ocaml-version (>= "3.5.0"))
   (ppx_sexp_conv (>= "v0.9.0"))
-  sexplib
+  sexplib0
   (alcotest (and (>= "1.9.1") :with-test)))
  (conflicts
   (result (< 1.5))
diff --git a/src-cmd/dockerfile_cmd.ml b/src-cmd/dockerfile_cmd.ml
@@ -15,7 +15,7 @@
  *
  *)
 
-open Sexplib.Conv
+open Sexplib0.Sexp_conv
 open Bos
 open Astring
 module OC = OS.Cmd
@@ -55,7 +55,7 @@ let run_log ?(ok_to_fail = true) ?env log_dir name cmd =
   let success = status = `Exited 0 in
   let cmd_log = { command; stdout; success; status } in
   let path = Fpath.(log_dir / (name ^ ".sxp")) in
-  OS.File.write path (Sexplib.Sexp.to_string_hum (sexp_of_cmd_log cmd_log))
+  OS.File.write path (Sexplib0.Sexp.to_string_hum (sexp_of_cmd_log cmd_log))
   >>= fun () ->
   match status with
   | `Signaled n -> if ok_to_fail then Ok () else Fmt.error_msg "Signal %d" n
diff --git a/src-opam/distro.ml b/src-opam/distro.ml
@@ -17,7 +17,7 @@
 
 (** Distro selection for various OPAM combinations. *)
 
-open Sexplib.Conv
+open Sexplib0.Sexp_conv
 
 type distro =
   [ `Alpine of
diff --git a/src-opam/dune b/src-opam/dune
@@ -2,6 +2,6 @@
  (name dockerfile_opam)
  (public_name dockerfile-opam)
  (synopsis "Dockerfile functions to generate opam2 base containers")
- (libraries ocaml-version dockerfile fmt sexplib)
+ (libraries ocaml-version dockerfile fmt sexplib0)
  (preprocess
   (pps ppx_sexp_conv)))
diff --git a/src/dockerfile.ml b/src/dockerfile.ml
@@ -15,7 +15,7 @@
  *
  *)
 
-open Sexplib.Conv
+open Sexplib0.Sexp_conv
 
 type shell_or_exec =
   [ `Shell of string | `Shells of string list | `Exec of string list ]
diff --git a/src/dockerfile.mli b/src/dockerfile.mli
@@ -24,10 +24,10 @@
 type t
 (** [t] is a list of Dockerfile lines *)
 
-val sexp_of_t : t -> Sexplib.Sexp.t
+val sexp_of_t : t -> Sexplib0.Sexp.t
 (** [sexp_of_t t] converts a Dockerfile into a s-expression representation. *)
 
-val t_of_sexp : Sexplib.Sexp.t -> t
+val t_of_sexp : Sexplib0.Sexp.t -> t
 (** [t_of_sexp s] converts the [s] s-expression representation into a {!t}. The
     s-expression should have been generated using {!sexp_of_t}. *)
 
diff --git a/src/dune b/src/dune
@@ -2,7 +2,7 @@
  (name dockerfile)
  (public_name dockerfile)
  (synopsis "Dockerfile eDSL and combinators")
- (libraries sexplib fmt)
+ (libraries sexplib0 fmt)
  (preprocess
   (per_module
    ((pps ppx_sexp_conv)

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ depends: [`
`42`	`42`	`"fmt" {>= "0.8.7"}`
`43`	`43`	`"logs"`
`44`	`44`	`"ppx_sexp_conv" {>= "v0.9.0"}`
`45`		`- "sexplib"`
	`45`	`+ "sexplib0"`
`46`	`46`	`"odoc" {with-doc}`
`47`	`47`	`]`
`48`	`48`	`conflicts: [`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ depends: [`
`39`	`39`	`"fmt" {>= "0.8.7"}`
`40`	`40`	`"ocaml-version" {>= "3.5.0"}`
`41`	`41`	`"ppx_sexp_conv" {>= "v0.9.0"}`
`42`		`- "sexplib"`
	`42`	`+ "sexplib0"`
`43`	`43`	`"alcotest" {>= "1.9.1" & with-test}`
`44`	`44`	`"odoc" {with-doc}`
`45`	`45`	`]`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ depends: [`
`35`	`35`	`"ocaml" {>= "4.08"}`
`36`	`36`	`"fmt" {>= "0.8.7"}`
`37`	`37`	`"ppx_sexp_conv" {>= "v0.9.0"}`
`38`		`- "sexplib"`
	`38`	`+ "sexplib0"`
`39`	`39`	`"alcotest" {>= "1.9.1" & with-test}`
`40`	`40`	`"odoc" {with-doc}`
`41`	`41`	`]`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`*`
`16`	`16`	`*)`
`17`	`17`
`18`		`-open Sexplib.Conv`
	`18`	`+open Sexplib0.Sexp_conv`
`19`	`19`
`20`	`20`	`type shell_or_exec =`
`21`	`21`	[ `Shell of string \| `Shells of string list \| `Exec of string list ]