ocamlPackages.smtml: 0.10.0 → 0.12.0 (#453714)

pkgs/development/ocaml-modules/dolmen/model.nix

@@ -0,0 +1,25 @@
+{
+  buildDunePackage,
+  dolmen,
+  dolmen_loop,
+  farith,
+  ppx_deriving,
+  zarith,
+}:
+
+buildDunePackage {
+  pname = "dolmen_model";
+  inherit (dolmen) src version;
+
+  propagatedBuildInputs = [
+    dolmen
+    dolmen_loop
+    farith
+    ppx_deriving
+    zarith
+  ];
+
+  meta = dolmen.meta // {
+    description = "Dolmen library for verifying models generated by automated theorem provers and SMT solvers";
+  };
+}

pkgs/development/ocaml-modules/smtml/default.nix

@@ -7,10 +7,12 @@
   menhir,
   bos,
   cmdliner,
+  dolmen_model,
   dolmen_type,
   fpath,
   hc,
   menhirLib,
+  mtime,
   # fix eval on legacy ocaml versions
   ocaml_intrinsics ? null,
   patricia-tree,
@@ -23,15 +25,15 @@
   ounit2,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "smtml";
-  version = "0.10.0";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "formalsec";
     repo = "smtml";
-    tag = "v${version}";
-    hash = "sha256-WXGYk/zJnW6QzHKCHl0lkmYb/pG90/sAOK40wYzK35U=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-WETSvhy5OfztOTqJimym0OaZLo053nl8pcoQlyyP8I0=";
   };
 
   nativeBuildInputs = [
@@ -41,10 +43,12 @@ buildDunePackage rec {
   propagatedBuildInputs = [
     bos
     cmdliner
+    dolmen_model
     dolmen_type
     fpath
     hc
     menhirLib
+    mtime
     ocaml_intrinsics
     patricia-tree
     prelude
@@ -63,14 +67,19 @@ buildDunePackage rec {
     mdx.bin
   ];
 
-  doCheck = !(lib.versions.majorMinor ocaml.version == "5.0" || stdenv.hostPlatform.isDarwin);
+  doCheck =
+    !(
+      lib.versions.majorMinor ocaml.version == "5.0"
+      || lib.versions.majorMinor ocaml.version == "5.4"
+      || stdenv.hostPlatform.isDarwin
+    );
 
   meta = {
     description = "SMT solver frontend for OCaml";
     homepage = "https://formalsec.github.io/smtml/smtml/";
     downloadPage = "https://github.com/formalsec/smtml";
-    changelog = "https://github.com/formalsec/smtml/releases/tag/v${version}";
+    changelog = "https://github.com/formalsec/smtml/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.ethancedwards8 ];
   };
-}
+})

pkgs/top-level/ocaml-packages.nix

@@ -424,6 +424,8 @@ let
 
         dolmen_lsp = callPackage ../development/ocaml-modules/dolmen/lsp.nix { };
 
+        dolmen_model = callPackage ../development/ocaml-modules/dolmen/model.nix { };
+
         dolmen_type = callPackage ../development/ocaml-modules/dolmen/type.nix { };
 
         dolog = callPackage ../development/ocaml-modules/dolog { };