diff --git a/pkgs/development/ocaml-modules/yaml/default.nix b/pkgs/development/ocaml-modules/yaml/default.nix
index c8b2b614e860..2b8714ed1034 100644
--- a/pkgs/development/ocaml-modules/yaml/default.nix
+++ b/pkgs/development/ocaml-modules/yaml/default.nix
@@ -1,22 +1,23 @@
 { lib, fetchurl, buildDunePackage
 , dune-configurator
-, ppx_sexp_conv
-, bos, ctypes, fmt, logs, rresult, sexplib
+, bos, ctypes, fmt, logs, rresult
+, mdx, alcotest, crowbar, junit_alcotest, ezjsonm
 }:
 
 buildDunePackage rec {
   pname = "yaml";
-  version = "2.1.0";
+  version = "3.0.0";
 
   useDune2 = true;
 
   src = fetchurl {
     url = "https://github.com/avsm/ocaml-yaml/releases/download/v${version}/yaml-v${version}.tbz";
-    sha256 = "03g8vsh5jgi1cm5q78v15slgnzifp91fp7n4v1i7pa8yk0bkh585";
+    sha256 = "1iws6lbnrrd5hhmm7lczfvqp0aidx5xn7jlqk2s5rjfmj9qf4j2c";
   };
 
   buildInputs = [ dune-configurator ];
-  propagatedBuildInputs = [ bos ctypes fmt logs ppx_sexp_conv rresult sexplib ];
+  propagatedBuildInputs = [ bos ctypes rresult ];
+  checkInputs = [ fmt logs mdx alcotest crowbar junit_alcotest ezjsonm ];
 
   meta = {
     description = "Parse and generate YAML 1.1 files";
diff --git a/pkgs/development/ocaml-modules/yaml/yaml-sexp.nix b/pkgs/development/ocaml-modules/yaml/yaml-sexp.nix
new file mode 100644
index 000000000000..960361458440
--- /dev/null
+++ b/pkgs/development/ocaml-modules/yaml/yaml-sexp.nix
@@ -0,0 +1,13 @@
+{ lib, fetchurl, buildDunePackage, yaml, dune-configurator, ppx_sexp_conv, sexplib }:
+
+buildDunePackage rec {
+  pname = "yaml-sexp";
+
+  inherit (yaml) version src useDune2;
+
+  propagatedBuildInputs = [ yaml ppx_sexp_conv sexplib ];
+
+  meta = yaml.meta // {
+    description = "ocaml-yaml with sexp support";
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 3a1fc6a93989..329d49323c87 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1408,6 +1408,8 @@ let
 
     yaml = callPackage ../development/ocaml-modules/yaml { };
 
+    yaml-sexp = callPackage ../development/ocaml-modules/yaml/yaml-sexp.nix { };
+
     yojson = callPackage ../development/ocaml-modules/yojson { };
 
     z3 = callPackage ../development/ocaml-modules/z3 {