@@ -1,14 +1,13 @@
1−{ stdenv, fetchFromGitHub, buildOcaml, ocsigen-toolkit, eliom, ocaml_pcre, pgocaml, macaque, safepass, yojson, ocsigen_deriving, ocsigen_server
1+{ stdenv, fetchFromGitHub, ocaml, findlib, ocsigen-toolkit, eliom, ocaml_pcre, pgocaml, macaque, safepass, yojson, ocsigen_deriving, ocsigen_server
22, js_of_ocaml-camlp4
33, resource-pooling
44}:
55
6−buildOcaml rec
7−{
8− name = "ocsigen-start";
9− version = "1.5.0";
6+stdenv.mkDerivation rec {
7+ name = "ocaml${ocaml.version}-ocsigen-start-${version}";
8+ version = "1.8.0";
109
11− buildInputs = [ eliom js_of_ocaml-camlp4 ];
10+ buildInputs = [ ocaml findlib eliom js_of_ocaml-camlp4 ];
1211 propagatedBuildInputs = [ pgocaml macaque safepass ocaml_pcre ocsigen-toolkit yojson ocsigen_deriving ocsigen_server resource-pooling ];
1312
1413 patches = [ ./templates-dir.patch ];
@@ -16,12 +15,14 @@ buildOcaml rec
1615 postPatch = ''
1716 substituteInPlace "src/os_db.ml" --replace "citext" "text"
1817 '';
18+
19+ createFindlibDestdir = true;
1920
2021 src = fetchFromGitHub {
2122 owner = "ocsigen";
22− repo = name;
23+ repo = "ocsigen-start";
2324 rev = version;
24− sha256 = "07478hz5jhxb242hfr808516k81vdbzj4j6cycvls3b9lzbyszha";
25+ sha256 = "0h5gp06vxy6jpppz1x840gyf9viiy7lic7spx7fxldpy2jpv058s";
2526 };
2627
2728 meta = {
@@ -31,6 +32,7 @@ buildOcaml rec
3132 An Eliom application skeleton, ready to use to build your own application with users, (pre)registration, notifications, etc.
3233 '';
3334 license = stdenv.lib.licenses.lgpl21;
35+ inherit (ocaml.meta) platforms;
3436 maintainers = [ stdenv.lib.maintainers.gal_bolle ];
3537 };
3638