@@ -1,15 +1,10 @@
1−{ stdenv, fetchurl, ocaml, findlib, which, ocsigen_server, ocsigen_deriving,
1+{ buildOcaml, stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml,
22 js_of_ocaml, ocaml_react, ocaml_lwt, calendar, cryptokit, tyxml,
33 ipaddr, ocamlnet, ocaml_ssl, ocaml_pcre, ocaml_optcomp,
4− reactivedata, opam, ppx_tools, camlp4}:
4+ reactivedata, opam, ppx_tools, ppx_deriving, camlp4}:
55
6−let ocamlVersion = (stdenv.lib.getVersion ocaml);
7− in
8−
9−(
10−assert stdenv.lib.versionAtLeast ocamlVersion "4";
11−
12−stdenv.mkDerivation rec
6+let ocamlVersion = (stdenv.lib.getVersion ocaml); in
7+buildOcaml rec
138{
149 pname = "eliom";
1510 version = "5.0.0";
@@ -22,12 +17,11 @@ stdenv.mkDerivation rec
2217
2318 patches = [ ./camlp4.patch ];
2419
25− buildInputs = [ocaml which ocsigen_server findlib ocsigen_deriving
26− js_of_ocaml ocaml_optcomp opam ppx_tools camlp4 ];
20+ buildInputs = [ which ocaml_optcomp opam ppx_tools camlp4 ];
2721
28− propagatedBuildInputs = [ ocaml_lwt reactivedata tyxml ipaddr
29− calendar cryptokit ocamlnet ocaml_react ocaml_ssl
30− ocaml_pcre ];
22+ propagatedBuildInputs = [ ocaml_lwt reactivedata tyxml ipaddr ocsigen_server ppx_deriving
23+ ocsigen_deriving js_of_ocaml
24+ calendar cryptokit ocamlnet ocaml_react ocaml_ssl ocaml_pcre ];
3125
3226 preConfigure = stdenv.lib.optionalString (!stdenv.lib.versionAtLeast ocamlVersion "4.02") ''
3327 export PPX=false
@@ -57,8 +51,6 @@ stdenv.mkDerivation rec
5751
5852 license = stdenv.lib.licenses.lgpl21;
5953
60− platforms = ocaml.meta.platforms or [];
61−
6254 maintainers = [ stdenv.lib.maintainers.gal_bolle ];
6355 };
64−})
56+}