git.iko.soy/typeable/nixpkgs
on master help sign in
ocamlPackages.eliom: 6.7.0 → 6.8.0

Ensures compatibility with OCaml 4.08

commitbe3f40bb99c5316070fa6e10ecf3438efcdc3dee authorVincent Laporte <Vincent.Laporte@gmail.com> dateSun 13 Oct 2019, 05:10 (7 years ago) parentdc2f247
3 files changed+12−22
pkgs/development/ocaml-modules/eliom/camlp4.patch−12 pkgs/development/ocaml-modules/eliom/default.nix+10−8 pkgs/development/ocaml-modules/ocsigen-start/default.nix+2−2
pkgs/development/ocaml-modules/eliom/camlp4.patchdeleted−12
@@ -1,12 +0,0 @@
1−--- a/src/_tags 2014-10-01 16:19:35.000000000 +0100
2−+++ b/src/_tags 2014-11-09 16:55:34.470663377 +0000
3−@@ -40,7 +40,7 @@
4− <lib/server/monitor/*.ml{,i}>:I(src/lib/server)
5−
6− <syntax/pa_*.*>: syntax(camlp4o),package(camlp4.quotations.o,camlp4.extend,bytes)
7−-<syntax/pa_*.ml{,i}>: I(+camlp4/Camlp4Parsers)
8−+<syntax/pa_*.ml{,i}>: use_camlp4_full
9−
10− <ppx/**/*>: package(ppx_tools, compiler-libs.common, ppx_tools.metaquot)
11−
12−
pkgs/development/ocaml-modules/eliom/default.nix+10−8
@@ -1,33 +1,35 @@
1−{ stdenv, fetchzip, which, ocsigen_server, ocsigen_deriving, ocaml, lwt_camlp4,
1+{ stdenv, fetchzip, which, ocsigen_server, ocaml,
22 lwt_react,
33 opaline, ppx_tools, ppx_deriving, findlib
4+, ppx_tools_versioned
45, js_of_ocaml-ocamlbuild, js_of_ocaml-ppx, js_of_ocaml-ppx_deriving_json
56, js_of_ocaml-lwt
67, js_of_ocaml-tyxml
78, lwt_ppx
89}:
910
11+if !stdenv.lib.versionAtLeast ocaml.version "4.07"
12+then throw "eliom is not available for OCaml ${ocaml.version}"
13+else
14+
1015stdenv.mkDerivation rec
1116{
1217 pname = "eliom";
13− version = "6.7.0";
18+ version = "6.8.0";
1419
1520 src = fetchzip {
1621 url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz";
17− sha256 = "0mrlpvjaihpsf2xr6p1gs0sz4cwzkknf5b1s32bhmqq5qzsh4j8k";
22+ sha256 = "0di4q0wzbnk9sxlaj97ivghzh8qvjb8n17h80y4nmqhys97pldif";
1823 };
1924
20− patches = [ ./camlp4.patch ];
21−
2225 buildInputs = [ ocaml which findlib js_of_ocaml-ocamlbuild js_of_ocaml-ppx_deriving_json opaline ppx_tools
23− ocsigen_deriving
26+ ppx_tools_versioned
2427 ];
2528
2629 propagatedBuildInputs = [
2730 js_of_ocaml-lwt
2831 js_of_ocaml-ppx
2932 js_of_ocaml-tyxml
30− lwt_camlp4
3133 lwt_ppx
3234 lwt_react
3335 ocsigen_server
@@ -40,7 +42,7 @@ stdenv.mkDerivation rec
4042
4143 meta = {
4244 homepage = http://ocsigen.org/eliom/;
43− description = "Ocaml Framework for programming Web sites and client/server Web applications";
45+ description = "OCaml Framework for programming Web sites and client/server Web applications";
4446
4547 longDescription =''Eliom is a framework for programming Web sites
4648 and client/server Web applications. It introduces new concepts to
pkgs/development/ocaml-modules/ocsigen-start/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitHub, ocaml, findlib, ocsigen-toolkit, eliom, ocaml_pcre, pgocaml, macaque, safepass, yojson, ocsigen_deriving, ocsigen_server
2−, js_of_ocaml-camlp4
2+, js_of_ocaml-camlp4, lwt_camlp4
33, resource-pooling
44}:
55
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
77 name = "ocaml${ocaml.version}-ocsigen-start-${version}";
88 version = "1.8.0";
99
10− buildInputs = [ ocaml findlib eliom js_of_ocaml-camlp4 ];
10+ buildInputs = [ ocaml findlib eliom js_of_ocaml-camlp4 lwt_camlp4 ];
1111 propagatedBuildInputs = [ pgocaml macaque safepass ocaml_pcre ocsigen-toolkit yojson ocsigen_deriving ocsigen_server resource-pooling ];
1212
1313 patches = [ ./templates-dir.patch ];