diff --git a/pkgs/development/ocaml-modules/containers/default.nix b/pkgs/development/ocaml-modules/containers/default.nix index 5fd9e9c947a5..b12b6e8c2657 100644 --- a/pkgs/development/ocaml-modules/containers/default.nix +++ b/pkgs/development/ocaml-modules/containers/default.nix @@ -16,7 +16,7 @@ buildDunePackage rec { buildInputs = [ iter ]; - checkInputs = lib.optionals doCheck [ gen mdx ounit qcheck uutf ]; + checkInputs = lib.optionals doCheck [ gen mdx.bin ounit qcheck uutf ]; propagatedBuildInputs = [ result uchar ]; diff --git a/pkgs/development/ocaml-modules/iter/default.nix b/pkgs/development/ocaml-modules/iter/default.nix index eb2ca1409ab8..964a7c6f5a32 100644 --- a/pkgs/development/ocaml-modules/iter/default.nix +++ b/pkgs/development/ocaml-modules/iter/default.nix @@ -11,7 +11,7 @@ buildDunePackage rec { sha256 = "0j2sg50byn0ppmf6l36ksip7zx1d3gv7sc4hbbxs2rmx39jr7vxh"; }; - buildInputs = lib.optionals doCheck [ mdx qtest ]; + buildInputs = lib.optionals doCheck [ mdx.bin qtest ]; propagatedBuildInputs = [ result ]; doCheck = lib.versionAtLeast ocaml.version "4.04"; diff --git a/pkgs/development/ocaml-modules/mdx/default.nix b/pkgs/development/ocaml-modules/mdx/default.nix index 0b43cf461e01..43c6c8e41fa7 100644 --- a/pkgs/development/ocaml-modules/mdx/default.nix +++ b/pkgs/development/ocaml-modules/mdx/default.nix @@ -1,24 +1,30 @@ -{ lib, fetchFromGitHub, buildDunePackage, ocaml, astring, cmdliner, cppo, fmt, logs, ocaml-migrate-parsetree, ocaml_lwt, pandoc, re }: +{ lib, fetchurl, buildDunePackage, opaline, ocaml +, astring, cmdliner, cppo, fmt, logs, ocaml-migrate-parsetree, ocaml-version, ocaml_lwt, pandoc, re }: buildDunePackage rec { pname = "mdx"; - version = "1.4.0"; + version = "1.5.0"; - src = fetchFromGitHub { - owner = "realworldocaml"; - repo = pname; - rev = version; - sha256 = "0ljd00d261s2wf7cab086asqi39icf9zs4nylni6dldaqb027d4w"; + src = fetchurl { + url = "https://github.com/realworldocaml/mdx/releases/download/1.5.0/mdx-1.5.0.tbz"; + sha256 = "0g45plf4z7d178gp0bx7842fwbd3m19679yfph3s95da6mrfm3xn"; }; nativeBuildInputs = [ cppo ]; - buildInputs = [ astring cmdliner fmt logs ocaml-migrate-parsetree re ]; + buildInputs = [ cmdliner ]; + propagatedBuildInputs = [ astring fmt logs ocaml-migrate-parsetree ocaml-version re ]; checkInputs = lib.optionals doCheck [ ocaml_lwt pandoc ]; - doCheck = !lib.versionAtLeast ocaml.version "4.08"; + doCheck = true; dontStrip = lib.versions.majorMinor ocaml.version == "4.04"; + outputs = [ "bin" "lib" "out" ]; + + installPhase = '' + ${opaline}/bin/opaline -prefix $bin -libdir $lib/lib/ocaml/${ocaml.version}/site-lib + ''; + meta = { homepage = https://github.com/realworldocaml/mdx; description = "Executable OCaml code blocks inside markdown files"; diff --git a/pkgs/development/ocaml-modules/printbox/default.nix b/pkgs/development/ocaml-modules/printbox/default.nix index 50866e1d9691..555ccef34951 100644 --- a/pkgs/development/ocaml-modules/printbox/default.nix +++ b/pkgs/development/ocaml-modules/printbox/default.nix @@ -13,7 +13,7 @@ buildDunePackage rec { sha256 = "16nwwpp13hzlcm9xqfxc558afm3i5s802dkj69l9s2vp04lgms5n"; }; - checkInputs = lib.optional doCheck mdx; + checkInputs = lib.optional doCheck mdx.bin; doCheck = !lib.versionAtLeast ocaml.version "4.08";