Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

ocamlPackages.eliom: 6.3.0 -> 6.4.0

+8 -21
+7 -11
pkgs/development/ocaml-modules/eliom/default.nix
··· 1 - { stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml, camlp4, 1 + { stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml, lwt_camlp4, 2 2 lwt_react, cryptokit, 3 - ipaddr, ocamlnet, lwt_ssl, ocaml_pcre, 3 + ipaddr, ocamlnet, ocaml_pcre, 4 4 opaline, ppx_tools, ppx_deriving, findlib 5 5 , js_of_ocaml-ocamlbuild, js_of_ocaml-ppx, js_of_ocaml-ppx_deriving_json 6 6 , js_of_ocaml-lwt 7 7 , js_of_ocaml-tyxml 8 + , lwt_ppx 8 9 }: 9 10 10 - assert stdenv.lib.versionAtLeast ocaml.version "4.03"; 11 - 12 11 stdenv.mkDerivation rec 13 12 { 14 13 pname = "eliom"; 15 - version = "6.3.0"; 14 + version = "6.4.0"; 16 15 name = "${pname}-${version}"; 17 16 18 17 src = fetchurl { 19 18 url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz"; 20 - sha256 = "137hgdzv9fwkzf6xdksqy437lrf8xvrycf5jwc3z4cmpsigs6x7v"; 19 + sha256 = "1ad7ympvj0cb51d9kbp4naxkld3gv8cfp4a037a5dr55761zdhdh"; 21 20 }; 22 21 23 22 patches = [ ./camlp4.patch ]; ··· 27 26 ]; 28 27 29 28 propagatedBuildInputs = [ 30 - camlp4 31 - cryptokit 32 - ipaddr 33 29 js_of_ocaml-lwt 34 30 js_of_ocaml-ppx 35 31 js_of_ocaml-tyxml 32 + lwt_camlp4 33 + lwt_ppx 36 34 lwt_react 37 - lwt_ssl 38 - ocamlnet ocaml_pcre 39 35 ocsigen_server 40 36 ppx_deriving 41 37 ];
+1 -10
pkgs/top-level/ocaml-packages.nix
··· 231 231 232 232 elina = callPackage ../development/ocaml-modules/elina { }; 233 233 234 - eliom = callPackage ../development/ocaml-modules/eliom { 235 - js_of_ocaml-lwt = js_of_ocaml-lwt.override { 236 - ocaml_lwt = lwt3; 237 - lwt_log = lib.overrideDerivation 238 - (lwt_log.override { lwt = lwt3; }) 239 - (_: { inherit (lwt3) src; }); 240 - }; 241 - lwt_react = lwt_react.override { lwt = lwt3; }; 242 - lwt_ssl = lwt_ssl.override { lwt = lwt3; }; 243 - }; 234 + eliom = callPackage ../development/ocaml-modules/eliom { }; 244 235 245 236 elpi = callPackage ../development/ocaml-modules/elpi { }; 246 237