diff --git a/pkgs/development/ocaml-modules/phylogenetics/default.nix b/pkgs/development/ocaml-modules/phylogenetics/default.nix index 1a23a4d3e13..1cb348a4165 100644 --- a/pkgs/development/ocaml-modules/phylogenetics/default.nix +++ b/pkgs/development/ocaml-modules/phylogenetics/default.nix @@ -11,7 +11,7 @@ , lacaml , menhir , menhirLib -, printbox +, printbox-text }: buildDunePackage rec { @@ -25,6 +25,11 @@ buildDunePackage rec { sha256 = "sha256:0knfh2s0jfnsc0vsq5yw5xla7m7i98xd0qv512dyh3jhkh7m00l9"; }; + # Ensure compatibility with printbox ≥ 0.6 + preConfigure = '' + substituteInPlace lib/dune --replace printbox printbox-text + ''; + minimalOCamlVersion = "4.08"; checkInputs = [ alcotest bppsuite ]; @@ -37,7 +42,7 @@ buildDunePackage rec { lacaml menhirLib ppx_deriving - printbox + printbox-text ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/printbox/default.nix b/pkgs/development/ocaml-modules/printbox/default.nix index 04361de7222..b42df087a9a 100644 --- a/pkgs/development/ocaml-modules/printbox/default.nix +++ b/pkgs/development/ocaml-modules/printbox/default.nix @@ -1,21 +1,21 @@ -{ lib, fetchFromGitHub, buildDunePackage, ocaml, uucp, uutf, mdx }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml, mdx }: buildDunePackage rec { pname = "printbox"; - version = "0.5"; + version = "0.6"; useDune2 = true; - minimumOCamlVersion = "4.03"; + minimalOCamlVersion = "4.03"; src = fetchFromGitHub { owner = "c-cube"; repo = pname; - rev = version; - sha256 = "099yxpp7d9bms6dwzp9im7dv1qb801hg5rx6awpx3rpfl4cvqfn2"; + rev = "v${version}"; + sha256 = "sha256:0vqp8j1vp8h8par699nnh31hnikzh6pqn07lqyxw65axqy3sc9dp"; }; - checkInputs = [ uucp uutf mdx.bin ]; + checkInputs = [ mdx.bin ]; # mdx is not available for OCaml < 4.07 doCheck = lib.versionAtLeast ocaml.version "4.07"; diff --git a/pkgs/development/ocaml-modules/printbox/text.nix b/pkgs/development/ocaml-modules/printbox/text.nix new file mode 100644 index 00000000000..cc0aa5691de --- /dev/null +++ b/pkgs/development/ocaml-modules/printbox/text.nix @@ -0,0 +1,14 @@ +{ buildDunePackage, printbox, uucp, uutf, mdx }: + +buildDunePackage { + pname = "printbox-text"; + inherit (printbox) src version useDune2 doCheck; + + propagatedBuildInputs = [ printbox uucp uutf ]; + + checkInputs = [ mdx.bin ]; + + meta = printbox.meta // { + description = "Text renderer for printbox, using unicode edges"; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index f3773c90693..671b05cccfb 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1179,6 +1179,8 @@ let printbox = callPackage ../development/ocaml-modules/printbox { }; + printbox-text = callPackage ../development/ocaml-modules/printbox/text.nix { }; + process = callPackage ../development/ocaml-modules/process { }; prof_spacetime = callPackage ../development/ocaml-modules/prof_spacetime { };