ocamlPackages.jingoo: 1.2.18 → 1.3.4

This commit is contained in:
sternenseemann 2020-05-13 22:04:09 +02:00 committed by Vincent Laporte
parent 2bf4a22e5a
commit 9d55751754
2 changed files with 13 additions and 15 deletions

View File

@ -1,26 +1,26 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, pcre, uutf }: { lib, buildDunePackage, fetchFromGitHub
, menhir, ppx_deriving, re, uutf, uucp, ounit2 }:
if !stdenv.lib.versionAtLeast ocaml.version "4.02" buildDunePackage rec {
then throw "jingoo is not available for OCaml ${ocaml.version}" pname = "jingoo";
else version = "1.3.4";
stdenv.mkDerivation rec { minimumOCamlVersion = "4.04";
name = "ocaml${ocaml.version}-jingoo-${version}";
version = "1.2.18";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tategakibunko"; owner = "tategakibunko";
repo = "jingoo"; repo = "jingoo";
rev = "v${version}"; rev = "v${version}";
sha256 = "0gciiysrjy5r4yiisc41k4h0p530yawzqnr364xg8fdkk444fgkn"; sha256 = "0fsmm6wxa3axwbcgwdidik3drg754wyh2vxri2w12d662221m98s";
}; };
buildInputs = [ ocaml findlib ]; buildInputs = [ menhir ];
propagatedBuildInputs = [ pcre uutf ]; propagatedBuildInputs = [ ppx_deriving re uutf uucp ];
checkInputs = [ ounit2 ];
doCheck = true;
createFindlibDestdir = true;
meta = with stdenv.lib; { meta = with lib; {
homepage = "https://github.com/tategakibunko/jingoo"; homepage = "https://github.com/tategakibunko/jingoo";
description = "OCaml template engine almost compatible with jinja2"; description = "OCaml template engine almost compatible with jinja2";
license = licenses.mit; license = licenses.mit;

View File

@ -393,9 +393,7 @@ let
irmin-watcher = callPackage ../development/ocaml-modules/irmin-watcher { }; irmin-watcher = callPackage ../development/ocaml-modules/irmin-watcher { };
jingoo = callPackage ../development/ocaml-modules/jingoo { jingoo = callPackage ../development/ocaml-modules/jingoo { };
pcre = ocaml_pcre;
};
js_of_ocaml = js_of_ocaml =
if lib.versionOlder "4.02" ocaml.version if lib.versionOlder "4.02" ocaml.version