diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2019-10-13 05:10:36 +0000 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2019-10-20 06:44:41 +0000 |
| commit | be3f40bb99c5316070fa6e10ecf3438efcdc3dee (patch) | |
| tree | f3020af1c69209e0bacb489c2ea90475c20f4a91 /pkgs/development/ocaml-modules/eliom | |
| parent | dc2f24796eb709157240c09030cb8331086ffa08 (diff) | |
| download | nixpkgs-be3f40bb99c5316070fa6e10ecf3438efcdc3dee.tar nixpkgs-be3f40bb99c5316070fa6e10ecf3438efcdc3dee.tar.gz nixpkgs-be3f40bb99c5316070fa6e10ecf3438efcdc3dee.tar.bz2 nixpkgs-be3f40bb99c5316070fa6e10ecf3438efcdc3dee.tar.lz nixpkgs-be3f40bb99c5316070fa6e10ecf3438efcdc3dee.tar.xz nixpkgs-be3f40bb99c5316070fa6e10ecf3438efcdc3dee.tar.zst nixpkgs-be3f40bb99c5316070fa6e10ecf3438efcdc3dee.zip | |
ocamlPackages.eliom: 6.7.0 → 6.8.0
Ensures compatibility with OCaml 4.08
Diffstat (limited to 'pkgs/development/ocaml-modules/eliom')
| -rw-r--r-- | pkgs/development/ocaml-modules/eliom/camlp4.patch | 12 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/eliom/default.nix | 18 |
2 files changed, 10 insertions, 20 deletions
diff --git a/pkgs/development/ocaml-modules/eliom/camlp4.patch b/pkgs/development/ocaml-modules/eliom/camlp4.patch deleted file mode 100644 index 06d5ba1b7ed..00000000000 --- a/pkgs/development/ocaml-modules/eliom/camlp4.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/src/_tags 2014-10-01 16:19:35.000000000 +0100 -+++ b/src/_tags 2014-11-09 16:55:34.470663377 +0000 -@@ -40,7 +40,7 @@ - <lib/server/monitor/*.ml{,i}>:I(src/lib/server) - - <syntax/pa_*.*>: syntax(camlp4o),package(camlp4.quotations.o,camlp4.extend,bytes) --<syntax/pa_*.ml{,i}>: I(+camlp4/Camlp4Parsers) -+<syntax/pa_*.ml{,i}>: use_camlp4_full - - <ppx/**/*>: package(ppx_tools, compiler-libs.common, ppx_tools.metaquot) - - diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index 25e75ceeba3..9a9ea28da53 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -1,33 +1,35 @@ -{ stdenv, fetchzip, which, ocsigen_server, ocsigen_deriving, ocaml, lwt_camlp4, +{ stdenv, fetchzip, which, ocsigen_server, ocaml, lwt_react, opaline, ppx_tools, ppx_deriving, findlib +, ppx_tools_versioned , js_of_ocaml-ocamlbuild, js_of_ocaml-ppx, js_of_ocaml-ppx_deriving_json , js_of_ocaml-lwt , js_of_ocaml-tyxml , lwt_ppx }: +if !stdenv.lib.versionAtLeast ocaml.version "4.07" +then throw "eliom is not available for OCaml ${ocaml.version}" +else + stdenv.mkDerivation rec { pname = "eliom"; - version = "6.7.0"; + version = "6.8.0"; src = fetchzip { url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz"; - sha256 = "0mrlpvjaihpsf2xr6p1gs0sz4cwzkknf5b1s32bhmqq5qzsh4j8k"; + sha256 = "0di4q0wzbnk9sxlaj97ivghzh8qvjb8n17h80y4nmqhys97pldif"; }; - patches = [ ./camlp4.patch ]; - buildInputs = [ ocaml which findlib js_of_ocaml-ocamlbuild js_of_ocaml-ppx_deriving_json opaline ppx_tools - ocsigen_deriving + ppx_tools_versioned ]; propagatedBuildInputs = [ js_of_ocaml-lwt js_of_ocaml-ppx js_of_ocaml-tyxml - lwt_camlp4 lwt_ppx lwt_react ocsigen_server @@ -40,7 +42,7 @@ stdenv.mkDerivation rec meta = { homepage = http://ocsigen.org/eliom/; - description = "Ocaml Framework for programming Web sites and client/server Web applications"; + description = "OCaml Framework for programming Web sites and client/server Web applications"; longDescription =''Eliom is a framework for programming Web sites and client/server Web applications. It introduces new concepts to |