public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ocamlPackages.eliom: 6.7.0 → 6.8.0

Browse Source 
Ensures compatibility with OCaml 4.08
This commit is contained in:
Vincent Laporte 2019-10-13 05:10:36 +00:00 committed by Vincent Laporte
parent dc2f24796e
commit be3f40bb99
3 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/ocaml-modules/eliom/camlp4.patch
View File

@ -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)

18
pkgs/development/ocaml-modules/eliom/default.nix
View File

@ -1,33 +1,35 @@
{ stdenv, fetchzip, which, ocsigen_server, ocsigen_deriving, ocaml, lwt_camlp4, { stdenv, fetchzip, which, ocsigen_server, ocaml,
lwt_react, lwt_react,
opaline, ppx_tools, ppx_deriving, findlib 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-ocamlbuild, js_of_ocaml-ppx, js_of_ocaml-ppx_deriving_json
, js_of_ocaml-lwt , js_of_ocaml-lwt
, js_of_ocaml-tyxml , js_of_ocaml-tyxml
, lwt_ppx , lwt_ppx
}: }:
if !stdenv.lib.versionAtLeast ocaml.version "4.07"
then throw "eliom is not available for OCaml ${ocaml.version}"
else
stdenv.mkDerivation rec stdenv.mkDerivation rec
{ {
pname = "eliom"; pname = "eliom";
version = "6.7.0"; version = "6.8.0";
src = fetchzip { src = fetchzip {
url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz"; 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 buildInputs = [ ocaml which findlib js_of_ocaml-ocamlbuild js_of_ocaml-ppx_deriving_json opaline ppx_tools
ocsigen_deriving ppx_tools_versioned
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
js_of_ocaml-lwt js_of_ocaml-lwt
js_of_ocaml-ppx js_of_ocaml-ppx
js_of_ocaml-tyxml js_of_ocaml-tyxml
lwt_camlp4
lwt_ppx lwt_ppx
lwt_react lwt_react
ocsigen_server ocsigen_server
@ -40,7 +42,7 @@ stdenv.mkDerivation rec
meta = { meta = {
homepage = http://ocsigen.org/eliom/; 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 longDescription =''Eliom is a framework for programming Web sites
and client/server Web applications. It introduces new concepts to and client/server Web applications. It introduces new concepts to

4
pkgs/development/ocaml-modules/ocsigen-start/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, ocsigen-toolkit, eliom, ocaml_pcre, pgocaml, macaque, safepass, yojson, ocsigen_deriving, ocsigen_server { stdenv, fetchFromGitHub, ocaml, findlib, ocsigen-toolkit, eliom, ocaml_pcre, pgocaml, macaque, safepass, yojson, ocsigen_deriving, ocsigen_server
, js_of_ocaml-camlp4 , js_of_ocaml-camlp4, lwt_camlp4
, resource-pooling , resource-pooling
}: }:
@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-ocsigen-start-${version}"; name = "ocaml${ocaml.version}-ocsigen-start-${version}";
version = "1.8.0"; version = "1.8.0";
buildInputs = [ ocaml findlib eliom js_of_ocaml-camlp4 ]; buildInputs = [ ocaml findlib eliom js_of_ocaml-camlp4 lwt_camlp4 ];
propagatedBuildInputs = [ pgocaml macaque safepass ocaml_pcre ocsigen-toolkit yojson ocsigen_deriving ocsigen_server resource-pooling ]; propagatedBuildInputs = [ pgocaml macaque safepass ocaml_pcre ocsigen-toolkit yojson ocsigen_deriving ocsigen_server resource-pooling ];
patches = [ ./templates-dir.patch ]; patches = [ ./templates-dir.patch ];