summary refs log tree commit diff
path: root/pkgs/development/ocaml-modules/eliom
diff options
context:
space:
mode:
authorVincent Laporte <Vincent.Laporte@gmail.com>2019-01-14 22:52:07 +0000
committerVincent Laporte <Vincent.Laporte@gmail.com>2019-02-03 14:20:14 +0000
commit686f8a4710a4e3c0800a7ba131d92033c964a20c (patch)
tree17e55bd0aa270f3daef35e56f5e68699b5962513 /pkgs/development/ocaml-modules/eliom
parent05350c00477b4b485a73e002d4bb56a6f4928a75 (diff)
downloadnixpkgs-686f8a4710a4e3c0800a7ba131d92033c964a20c.tar
nixpkgs-686f8a4710a4e3c0800a7ba131d92033c964a20c.tar.gz
nixpkgs-686f8a4710a4e3c0800a7ba131d92033c964a20c.tar.bz2
nixpkgs-686f8a4710a4e3c0800a7ba131d92033c964a20c.tar.lz
nixpkgs-686f8a4710a4e3c0800a7ba131d92033c964a20c.tar.xz
nixpkgs-686f8a4710a4e3c0800a7ba131d92033c964a20c.tar.zst
nixpkgs-686f8a4710a4e3c0800a7ba131d92033c964a20c.zip
ocamlPackages.eliom: 6.3.0 -> 6.4.0
Diffstat (limited to 'pkgs/development/ocaml-modules/eliom')
-rw-r--r--pkgs/development/ocaml-modules/eliom/default.nix18
1 files changed, 7 insertions, 11 deletions
diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix
index f82cf33e307..ec63e58fbb6 100644
--- a/pkgs/development/ocaml-modules/eliom/default.nix
+++ b/pkgs/development/ocaml-modules/eliom/default.nix
@@ -1,23 +1,22 @@
-{ stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml, camlp4,
+{ stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml, lwt_camlp4,
   lwt_react, cryptokit,
-  ipaddr, ocamlnet, lwt_ssl, ocaml_pcre,
+  ipaddr, ocamlnet, ocaml_pcre,
   opaline, 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
+, lwt_ppx
 }:
 
-assert stdenv.lib.versionAtLeast ocaml.version "4.03";
-
 stdenv.mkDerivation rec
 {
   pname = "eliom";
-  version = "6.3.0";
+  version = "6.4.0";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz";
-    sha256 = "137hgdzv9fwkzf6xdksqy437lrf8xvrycf5jwc3z4cmpsigs6x7v";
+    sha256 = "1ad7ympvj0cb51d9kbp4naxkld3gv8cfp4a037a5dr55761zdhdh";
   };
 
   patches = [ ./camlp4.patch ];
@@ -27,15 +26,12 @@ stdenv.mkDerivation rec
   ];
 
   propagatedBuildInputs = [
-    camlp4
-    cryptokit
-    ipaddr
     js_of_ocaml-lwt
     js_of_ocaml-ppx
     js_of_ocaml-tyxml
+    lwt_camlp4
+    lwt_ppx
     lwt_react
-    lwt_ssl
-    ocamlnet ocaml_pcre
     ocsigen_server
     ppx_deriving
   ];