diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2018-03-31 05:41:24 +0000 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2018-04-28 14:31:50 +0000 |
| commit | 8994fff8bb06b86c42aff28b8ef6f9cc77cb81af (patch) | |
| tree | 946f403e87dcdc644b4546fbbbecc27533c71311 /pkgs/development | |
| parent | eaf0592498070e3184316c9c63c3dd1c5264cd95 (diff) | |
| download | nixlib-8994fff8bb06b86c42aff28b8ef6f9cc77cb81af.tar nixlib-8994fff8bb06b86c42aff28b8ef6f9cc77cb81af.tar.gz nixlib-8994fff8bb06b86c42aff28b8ef6f9cc77cb81af.tar.bz2 nixlib-8994fff8bb06b86c42aff28b8ef6f9cc77cb81af.tar.lz nixlib-8994fff8bb06b86c42aff28b8ef6f9cc77cb81af.tar.xz nixlib-8994fff8bb06b86c42aff28b8ef6f9cc77cb81af.tar.zst nixlib-8994fff8bb06b86c42aff28b8ef6f9cc77cb81af.zip | |
ocamlPackages.eliom: 6.2.0 -> 6.3.0
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/ocaml-modules/eliom/default.nix | 40 |
1 files changed, 26 insertions, 14 deletions
diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index 42afec7e439d..da9383c4e95b 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -1,35 +1,47 @@ -{ stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml, - js_of_ocaml, react, lwt, calendar, cryptokit, tyxml, - ipaddr, ocamlnet, ssl, ocaml_pcre, ocaml_optcomp, - reactivedata, opam, ppx_tools, ppx_deriving, findlib -, ocamlbuild +{ stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml, camlp4, + js_of_ocaml, lwt_react, cryptokit, + ipaddr, ocamlnet, lwt_ssl, ocaml_pcre, + opam, ppx_tools, ppx_deriving, findlib +, js_of_ocaml-ocamlbuild, js_of_ocaml-ppx, js_of_ocaml-ppx_deriving_json +, js_of_ocaml-lwt +, js_of_ocaml-tyxml }: -assert stdenv.lib.versionAtLeast ocaml.version "4.02"; +assert stdenv.lib.versionAtLeast ocaml.version "4.03"; stdenv.mkDerivation rec { pname = "eliom"; - version = "6.2.0"; + version = "6.3.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz"; - sha256 = "01c4l982ld6d1ndhb6f15ldb2li7mv0bs279d5gs99mpiwsapadx"; + sha256 = "137hgdzv9fwkzf6xdksqy437lrf8xvrycf5jwc3z4cmpsigs6x7v"; }; patches = [ ./camlp4.patch ]; - buildInputs = [ ocaml which findlib ocamlbuild ocaml_optcomp opam ppx_tools ]; + buildInputs = [ ocaml which findlib js_of_ocaml-ocamlbuild js_of_ocaml-ppx_deriving_json opam ppx_tools + ocsigen_deriving + ]; - propagatedBuildInputs = [ lwt reactivedata tyxml ipaddr ocsigen_server ppx_deriving - ocsigen_deriving js_of_ocaml - calendar cryptokit ocamlnet react ssl ocaml_pcre ]; + propagatedBuildInputs = [ + camlp4 + cryptokit + ipaddr + js_of_ocaml-lwt + js_of_ocaml-ppx + js_of_ocaml-tyxml + lwt_react + lwt_ssl + ocamlnet ocaml_pcre + ocsigen_server + ppx_deriving + ]; installPhase = "opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR"; - createFindlibDestdir = true; - setupHook = [ ./setup-hook.sh ]; meta = { |