ocamlPackages.bistro: unstable-2021-07-13 -> unstable-2021-11-13
This commit is contained in:
parent
36a614fe66
commit
2813d6194b
|
@ -15,25 +15,27 @@
|
||||||
|
|
||||||
buildDunePackage rec {
|
buildDunePackage rec {
|
||||||
pname = "bistro";
|
pname = "bistro";
|
||||||
version = "unstable-2021-07-13";
|
version = "unstable-2021-11-13";
|
||||||
|
|
||||||
useDune2 = true;
|
useDune2 = true;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "pveber";
|
owner = "pveber";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "4ce8d98f34f15ebf63ececccc9c763fec2b5fa6d";
|
rev = "fb285b2c6d8adccda3c71e2293bceb01febd6624";
|
||||||
sha256 = "sha256:16vxcdsj4dmswgm6igshs3hirz8jrg8l5b2xgcnxxgvsrc9sxljs";
|
sha256 = "sha256-JChDU1WH8W9Czkppx9SHiVIu9/7QFWJy2A89oksp0Ek=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Fix build with ppxlib 0.23
|
|
||||||
postPatch = ''
|
|
||||||
substituteInPlace ppx/bistro_script.ml \
|
|
||||||
--replace 'Parser.parse_expression' 'Ocaml_common.Parser.parse_expression'
|
|
||||||
'';
|
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
base64 bos core lwt_react ocamlgraph ppx_sexp_conv rresult sexplib tyxml
|
base64
|
||||||
|
bos
|
||||||
|
core
|
||||||
|
lwt_react
|
||||||
|
ocamlgraph
|
||||||
|
ppx_sexp_conv
|
||||||
|
rresult
|
||||||
|
sexplib
|
||||||
|
tyxml
|
||||||
];
|
];
|
||||||
|
|
||||||
minimalOCamlVersion = "4.12";
|
minimalOCamlVersion = "4.12";
|
||||||
|
@ -43,7 +45,5 @@ buildDunePackage rec {
|
||||||
description = "Build and execute typed scientific workflows";
|
description = "Build and execute typed scientific workflows";
|
||||||
maintainers = [ lib.maintainers.vbgl ];
|
maintainers = [ lib.maintainers.vbgl ];
|
||||||
license = lib.licenses.gpl2;
|
license = lib.licenses.gpl2;
|
||||||
# ppx-related build failure; see https://github.com/pveber/bistro/issues/49:
|
|
||||||
broken = lib.versionAtLeast ocaml.version "4.13";
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue