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

Merge pull request #15833 from FlorentBecker/eliom5

Browse Source 
Update the Eliom ecosystem to 2016-01
This commit is contained in:
vbgl 2016-06-04 14:08:19 +02:00
commit c3b791f15b
11 changed files with 82 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,24 +1,12 @@
--- a/src/_tags 2014-10-01 16:19:35.000000000 +0100
+++ b/src/_tags 2014-11-09 16:55:34.470663377 +0000
@@ -39,7 +39,7 @@
@@ -40,7 +40,7 @@
<lib/server/monitor/*.ml{,i}>:I(src/lib/server)
<syntax/pa_*.ml{,i}>: syntax(camlp4o),package(camlp4.quotations.o,camlp4.extend)
<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)
<ocamlbuild/ocamlbuild_eliom.ml{,i}>: package(ocamlbuild,js_of_ocaml.ocamlbuild)
--- a/src/lib/eliom_registration.server.ml 2014-10-01 16:19:35.000000000 +0100
+++ b/src/lib/eliom_registration.server.ml 2014-11-09 17:26:16.093198699 +0000
@@ -2440,7 +2440,7 @@
(Ocaml.register_post_coservice'
?scope ?options ?charset ?code ?content_type ?headers ?secure_session ?name
?csrf_safe ?csrf_scope ?csrf_secure ?max_use ?timeout ?https ?error_handler
- ~post_params:Eliom_parameter.(ocaml "argument" argument_type)
+ ~post_params:(Eliom_parameter.ocaml "argument" argument_type)
(fun () argument -> f argument))
(Eliom_wrap.create_unwrapper
(Eliom_wrap.id_of_int Eliom_common_base.server_function_unwrap_id_int))

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

@ -1,33 +1,39 @@
{ stdenv, fetchurl, ocaml, findlib, which, ocsigen_server, ocsigen_deriving,
js_of_ocaml, ocaml_react, ocaml_lwt, calendar, cryptokit, tyxml,
ipaddr, ocamlnet, ocaml_ssl, ocaml_pcre, ocaml_optcomp,
reactivedata, opam}:
reactivedata, opam, ppx_tools, camlp4}:
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4";
let ocamlVersion = (stdenv.lib.getVersion ocaml);
in
(
assert stdenv.lib.versionAtLeast ocamlVersion "4";
stdenv.mkDerivation rec
{
pname = "eliom";
version = "4.2.0";
version = "5.0.0";
name = "${pname}-${version}";
src = fetchurl {
url = https://github.com/ocsigen/eliom/archive/4.2.tar.gz;
sha256 = "0gbqzgn6xgpq6irz2sfr92qj3hjcwl45wy0inc4ps5r15nvq1l9h";
url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz";
sha256 = "1g9wq2qpn0sgzyb6iq0h9afq5p68il4h8pc7jppqsislk87m09k7";
};
patches = [ ./camlp4.patch ];
buildInputs = [ocaml which ocsigen_server findlib ocsigen_deriving
js_of_ocaml ocaml_optcomp opam];
js_of_ocaml ocaml_optcomp opam ppx_tools camlp4 ];
propagatedBuildInputs = [ ocaml_lwt reactivedata tyxml ipaddr
calendar cryptokit ocamlnet ocaml_react ocaml_ssl
ocaml_pcre ];
preConfigure = stdenv.lib.optionalString (!stdenv.lib.versionAtLeast ocamlVersion "4.02") ''
export PPX=false
'';
installPhase =
let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version;
in
''opam-installer --script --prefix=$out ${pname}.install > install.sh
sh install.sh
ln -s $out/lib/${pname} $out/lib/ocaml/${ocamlVersion}/site-lib/
@ -55,4 +61,4 @@ stdenv.mkDerivation rec
maintainers = [ stdenv.lib.maintainers.gal_bolle ];
};
}
})

31
pkgs/development/ocaml-modules/markup/default.nix Normal file
View File

@ -0,0 +1,31 @@
{ stdenv, fetchurl, ocaml, findlib, uutf, lwt }:
stdenv.mkDerivation rec {
pname = "ocaml-markup";
version = "0.7.2";
name = "${pname}-${version}";
src = fetchurl {
url = "http://github.com/aantron/markup.ml/archive/${version}.tar.gz";
sha256 = "0d3wi22v7h0iqzq8dgl0g4fj2wb67gvmbzdckacifghinrx762k3";
};
buildInputs = [ocaml findlib];
installPhase = "make ocamlfind-install";
propagatedBuildInputs = [uutf lwt];
createFindlibDestdir = true;
meta = with stdenv.lib; {
homepage = https://github.com/aantron/markup.ml/;
description = "A pair of best-effort parsers implementing the HTML5 and XML specifications";
license = licenses.bsd2;
platforms = ocaml.meta.platforms or [];
maintainers = with maintainers; [
gal_bolle
];
};
}

6
pkgs/development/ocaml-modules/ocsigen-server/default.nix
View File

@ -9,11 +9,11 @@ let mkpath = p: n:
in
stdenv.mkDerivation {
name = "ocsigenserver-2.6";
name = "ocsigenserver-2.7";
src = fetchurl {
url = https://github.com/ocsigen/ocsigenserver/archive/2.6.tar.gz;
sha256 = "0638xvlr0sssvjarmdwhgh7vbgdx8wiyjwq73w1bkjfwl7qm21zp";
url = https://github.com/ocsigen/ocsigenserver/archive/2.7.tar.gz;
sha256 = "0gv9nchsx9z74hh46gn7bd0053j4694fhxriannf13sqh2qpg901";
};
buildInputs = [ocaml which findlib ocaml_react ocaml_ssl ocaml_lwt

6
pkgs/development/ocaml-modules/ppx_tools/default.nix
View File

@ -1,10 +1,10 @@
{ stdenv, fetchzip, ocaml, findlib }:
stdenv.mkDerivation {
name = "ocaml-ppx_tools-4.02.3";
name = "ocaml-ppx_tools-5.0+4.02";
src = fetchzip {
url = https://github.com/alainfrisch/ppx_tools/archive/v4.02.3.tar.gz;
sha256 = "0varkd93hgrarwwkrjp2yy735q7jqzba75sskyanmvkb576wpcxv";
url = https://github.com/alainfrisch/ppx_tools/archive/5.0+4.02.0.tar.gz;
sha256 = "16drjk0qafjls8blng69qiv35a84wlafpk16grrg2i3x19p8dlj8";
};
buildInputs = [ ocaml findlib ];

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

@ -1,11 +1,11 @@
{ stdenv, fetchzip, ocaml, findlib, ounit }:
stdenv.mkDerivation rec {
name = "ocaml-re-1.4.1";
name = "ocaml-re-1.5.0";
src = fetchzip {
url = "https://github.com/ocaml/ocaml-re/archive/${name}.tar.gz";
sha256 = "1wmfgazydd20hc796zisqpmsw0sb5lv9g3x77ckmf50v3z8hyhvk";
sha256 = "17avk7kwmgdjkri1sj5q4a59ykc9rj0bxj6ixxpl6i0n49br3f92";
};
buildInputs = [ ocaml findlib ounit ];

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

@ -1,10 +1,10 @@
{stdenv, fetchurl, ocaml, findlib, opam}:
stdenv.mkDerivation {
name = "ocaml-react-1.1.0";
name = "ocaml-react-1.2.0";
src = fetchurl {
url = http://erratique.ch/software/react/releases/react-1.1.0.tbz;
url = http://erratique.ch/software/react/releases/react-1.2.0.tbz;
sha256 = "1gymn8hy7ga0l9qymmb1jcnnkqvy7l2zr87xavzqz0dfi9ci8dm7";
};

12
pkgs/development/ocaml-modules/reactivedata/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, ocaml, findlib, ocaml_react, opam}:
{stdenv, fetchurl, ocaml, findlib, ocaml_react, camlp4, opam}:
let
ocamlVersion = stdenv.lib.getVersion ocaml;
@ -7,13 +7,13 @@ in
assert stdenv.lib.versionAtLeast ocamlVersion "3.11";
stdenv.mkDerivation {
name = "ocaml-reactiveData-0.1";
name = "ocaml-reactiveData-0.2";
src = fetchurl {
url = https://github.com/hhugo/reactiveData/archive/0.1.tar.gz;
sha256 = "056y9in6j6rpggdf8apailvs1m30wxizpyyrj08xyfxgv91mhxgw";
url = https://github.com/ocsigen/reactiveData/archive/0.2.tar.gz;
sha256 = "0rskcxnyjn8sxqnncdm6rh9wm99nha5m5sc83fywgzs64xfl43fq";
};
buildInputs = [ocaml findlib opam];
buildInputs = [ocaml findlib opam camlp4 ];
propagatedBuildInputs = [ocaml_react];
buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true";
@ -26,7 +26,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "An OCaml module for functional reactive programming (FRP) based on React";
homepage = https://github.com/hhugo/reactiveData;
homepage = https://github.com/ocsigen/reactiveData;
license = licenses.lgpl21;
platforms = ocaml.meta.platforms or [];
maintainers = with maintainers; [ vbgl ];

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

@ -1,19 +1,23 @@
{ stdenv, fetchurl, ocaml, findlib, ocaml_oasis, camlp4, uutf }:
{ stdenv, fetchurl, ocaml, findlib, ocaml_oasis, camlp4, uutf, markup, ppx_tools, re }:
stdenv.mkDerivation {
name = "tyxml-3.4.0";
stdenv.mkDerivation rec {
pname = "tyxml";
version = "3.6.0";
name = "${pname}-${version}";
src = fetchurl {
url = http://github.com/ocsigen/tyxml/archive/3.4.0.tar.gz;
sha256 = "10hb0b2j33fjqzmx450ns7dmf4pqmx3gyvr6dk99mghqk13cj5ww";
url = "http://github.com/ocsigen/tyxml/archive/${version}.tar.gz";
sha256 = "1rz0f48x8p1m30723rn5v85pp7rd0spr04sd7gzryy99vn3ianga";
};
buildInputs = [ocaml findlib ocaml_oasis camlp4];
buildInputs = [ocaml findlib camlp4];
propagatedBuildInputs = [uutf];
propagatedBuildInputs = [uutf re ppx_tools markup];
createFindlibDestdir = true;
configureFlags = "--enable-syntax";
meta = with stdenv.lib; {
homepage = http://ocsigen.org/tyxml/;
description = "A library that makes it almost impossible for your OCaml programs to generate wrong XML output, using static typing";

14
pkgs/development/tools/ocaml/js_of_ocaml/default.nix
View File

@ -1,24 +1,18 @@
{stdenv, fetchurl, ocaml, findlib, ocaml_lwt, menhir, ocsigen_deriving, camlp4,
cmdliner, tyxml, reactivedata, cppo, which, base64}:
let camlp4_patch = fetchurl {
url = "https://github.com/FlorentBecker/js_of_ocaml/commit/3b511c5bb777d5049c49d7a04c01f142de7096b9.patch";
sha256 = "c92eda8be504cd41eb242166fc815af496243b63d4d21b169f5b62ec5ace2d39";
};
in
stdenv.mkDerivation {
name = "js_of_ocaml-2.6";
name = "js_of_ocaml-2.7";
src = fetchurl {
url = https://github.com/ocsigen/js_of_ocaml/archive/2.6.tar.gz;
sha256 = "0q34lrn70dvz41m78bwgriyq6dxk97g8gcyg80nvxii4jp86dw61";
url = https://github.com/ocsigen/js_of_ocaml/archive/2.7.tar.gz;
sha256 = "1dali1akyd4zmkwav0d957ynxq2jj6cc94r4xiaql7ca89ajz4jj";
};
buildInputs = [ocaml findlib menhir ocsigen_deriving
cmdliner tyxml reactivedata cppo which base64];
propagatedBuildInputs = [ ocaml_lwt camlp4 ];
patches = [ ./Makefile.conf.diff camlp4_patch ];
patches = [ ./Makefile.conf.diff ];
createFindlibDestdir = true;

2
pkgs/top-level/all-packages.nix
View File

@ -5009,6 +5009,8 @@ in
magick = callPackage ../development/ocaml-modules/magick { };
markup = callPackage ../development/ocaml-modules/markup { lwt = ocaml_lwt; };
menhir = callPackage ../development/ocaml-modules/menhir { };
merlin = callPackage ../development/tools/ocaml/merlin { };