b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

ocamlPackages.printbox: 0.5 → 0.6

Browse source 
ocamlPackages.printbox-text: init at 0.6
This commit is contained in:
Vincent Laporte 2022-01-31 20:43:06 +01:00 committed by Vincent Laporte
parent cb78e66947
commit ecd0acf293
4 changed files with 29 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/development/ocaml-modules/phylogenetics/default.nix
View file

@ -11,7 +11,7 @@
, lacaml , lacaml
, menhir , menhir
, menhirLib , menhirLib
, printbox , printbox-text
}: }:
buildDunePackage rec { buildDunePackage rec {
@ -25,6 +25,11 @@ buildDunePackage rec {
sha256 = "sha256:0knfh2s0jfnsc0vsq5yw5xla7m7i98xd0qv512dyh3jhkh7m00l9"; sha256 = "sha256:0knfh2s0jfnsc0vsq5yw5xla7m7i98xd0qv512dyh3jhkh7m00l9";
}; };
# Ensure compatibility with printbox ≥ 0.6
preConfigure = ''
substituteInPlace lib/dune --replace printbox printbox-text
'';
minimalOCamlVersion = "4.08"; minimalOCamlVersion = "4.08";
checkInputs = [ alcotest bppsuite ]; checkInputs = [ alcotest bppsuite ];
@ -37,7 +42,7 @@ buildDunePackage rec {
lacaml lacaml
menhirLib menhirLib
ppx_deriving ppx_deriving
printbox printbox-text
]; ];
doCheck = true; doCheck = true;

12
pkgs/development/ocaml-modules/printbox/default.nix
View file

@ -1,21 +1,21 @@
{ lib, fetchFromGitHub, buildDunePackage, ocaml, uucp, uutf, mdx }: { lib, fetchFromGitHub, buildDunePackage, ocaml, mdx }:
buildDunePackage rec { buildDunePackage rec {
pname = "printbox"; pname = "printbox";
version = "0.5"; version = "0.6";
useDune2 = true; useDune2 = true;
minimumOCamlVersion = "4.03"; minimalOCamlVersion = "4.03";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "c-cube"; owner = "c-cube";
repo = pname; repo = pname;
rev = version; rev = "v${version}";
sha256 = "099yxpp7d9bms6dwzp9im7dv1qb801hg5rx6awpx3rpfl4cvqfn2"; sha256 = "sha256:0vqp8j1vp8h8par699nnh31hnikzh6pqn07lqyxw65axqy3sc9dp";
}; };
checkInputs = [ uucp uutf mdx.bin ]; checkInputs = [ mdx.bin ];
# mdx is not available for OCaml < 4.07 # mdx is not available for OCaml < 4.07
doCheck = lib.versionAtLeast ocaml.version "4.07"; doCheck = lib.versionAtLeast ocaml.version "4.07";

14
pkgs/development/ocaml-modules/printbox/text.nix Normal file
View file

@ -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";
};
}

2
pkgs/top-level/ocaml-packages.nix
View file

@ -1179,6 +1179,8 @@ let
printbox = callPackage ../development/ocaml-modules/printbox { }; printbox = callPackage ../development/ocaml-modules/printbox { };
printbox-text = callPackage ../development/ocaml-modules/printbox/text.nix { };
process = callPackage ../development/ocaml-modules/process { }; process = callPackage ../development/ocaml-modules/process { };
prof_spacetime = callPackage ../development/ocaml-modules/prof_spacetime { }; prof_spacetime = callPackage ../development/ocaml-modules/prof_spacetime { };