MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #39656 from vbgl/ocsigen_server-2.9

Browse source 
ocsigen: 2.8 → 2.9; eliom: 6.2.0 → 6.3.0
This commit is contained in:
Vincent Laporte 2018-05-06 11:16:40 +02:00 committed by GitHub
commit d79e9d3e16
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 65 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
pkgs/development/ocaml-modules/eliom/default.nix
View file

@ -1,35 +1,47 @@
{ stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml,
js_of_ocaml, react, lwt, calendar, cryptokit, tyxml,
ipaddr, ocamlnet, ssl, ocaml_pcre, ocaml_optcomp,
reactivedata, opam, ppx_tools, ppx_deriving, findlib
, ocamlbuild
{ stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml, camlp4,
js_of_ocaml, lwt_react, cryptokit,
ipaddr, ocamlnet, lwt_ssl, ocaml_pcre,
opam, ppx_tools, ppx_deriving, findlib
, js_of_ocaml-ocamlbuild, js_of_ocaml-ppx, js_of_ocaml-ppx_deriving_json
, js_of_ocaml-lwt
, js_of_ocaml-tyxml
}:
assert stdenv.lib.versionAtLeast ocaml.version "4.02";
assert stdenv.lib.versionAtLeast ocaml.version "4.03";
stdenv.mkDerivation rec
{
pname = "eliom";
version = "6.2.0";
version = "6.3.0";
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz";
sha256 = "01c4l982ld6d1ndhb6f15ldb2li7mv0bs279d5gs99mpiwsapadx";
sha256 = "137hgdzv9fwkzf6xdksqy437lrf8xvrycf5jwc3z4cmpsigs6x7v";
};
patches = [ ./camlp4.patch ];
buildInputs = [ ocaml which findlib ocamlbuild ocaml_optcomp opam ppx_tools ];
buildInputs = [ ocaml which findlib js_of_ocaml-ocamlbuild js_of_ocaml-ppx_deriving_json opam ppx_tools
ocsigen_deriving
];
propagatedBuildInputs = [ lwt reactivedata tyxml ipaddr ocsigen_server ppx_deriving
ocsigen_deriving js_of_ocaml
calendar cryptokit ocamlnet react ssl ocaml_pcre ];
propagatedBuildInputs = [
camlp4
cryptokit
ipaddr
js_of_ocaml-lwt
js_of_ocaml-ppx
js_of_ocaml-tyxml
lwt_react
lwt_ssl
ocamlnet ocaml_pcre
ocsigen_server
ppx_deriving
];
installPhase = "opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR";
createFindlibDestdir = true;
setupHook = [ ./setup-hook.sh ];
meta = {

33
pkgs/development/ocaml-modules/ocsigen-server/default.nix
View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, ocaml, findlib, which, react, ssl,
lwt, ocamlnet, ocaml_pcre, cryptokit, tyxml, ipaddr, zlib,
{ stdenv, fetchurl, ocaml, findlib, which, react, ssl
, ocamlnet, ocaml_pcre, cryptokit, tyxml, ipaddr, zlib,
libev, openssl, ocaml_sqlite3, tree, uutf, makeWrapper, camlp4
, camlzip, pgocaml
, camlzip, pgocaml, lwt2, lwt_react, lwt_ssl
}:
let mkpath = p: n:
@ -9,17 +9,32 @@ let mkpath = p: n:
"${p}/lib/ocaml/${v}/site-lib/${n}";
in
let param =
if stdenv.lib.versionAtLeast ocaml.version "4.03" then {
version = "2.9";
sha256 = "0na3qa4h89f2wv31li63nfpg4151d0g8fply0bq59j3bhpyc85nd";
buildInputs = [ lwt_react lwt_ssl ];
ldpath = "";
} else {
version = "2.8";
sha256 = "1v44qv2ixd7i1qinyhlzzqiffawsdl7xhhh6ysd7lf93kh46d5sy";
buildInputs = [ lwt2 ];
ldpath = "${mkpath lwt2 "lwt"}";
}
; in
stdenv.mkDerivation {
name = "ocsigenserver-2.8";
name = "ocsigenserver-${param.version}";
src = fetchurl {
url = https://github.com/ocsigen/ocsigenserver/archive/2.8.tar.gz;
sha256 = "1v44qv2ixd7i1qinyhlzzqiffawsdl7xhhh6ysd7lf93kh46d5sy";
url = "https://github.com/ocsigen/ocsigenserver/archive/${param.version}.tar.gz";
inherit (param) sha256;
};
buildInputs = [ocaml which findlib react ssl lwt
buildInputs = [ocaml which findlib react ssl
ocamlnet ocaml_pcre cryptokit tyxml ipaddr zlib libev openssl
ocaml_sqlite3 tree uutf makeWrapper camlp4 pgocaml camlzip ];
ocaml_sqlite3 tree uutf makeWrapper camlp4 pgocaml camlzip ]
++ (param.buildInputs or []);
configureFlags = "--root $(out) --prefix /";
@ -31,7 +46,7 @@ stdenv.mkDerivation {
''
rm -rf $out/var/run
wrapProgram $out/bin/ocsigenserver \
--prefix CAML_LD_LIBRARY_PATH : "${mkpath ssl "ssl"}:${mkpath lwt "lwt"}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath cryptokit "cryptokit"}:${mkpath ocaml_sqlite3 "sqlite3"}"
--prefix CAML_LD_LIBRARY_PATH : "${mkpath ssl "ssl"}:${param.ldpath}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath cryptokit "cryptokit"}:${mkpath ocaml_sqlite3 "sqlite3"}"
'';
dontPatchShebangs = true;

12
pkgs/development/ocaml-modules/ocsigen-start/default.nix
View file

@ -1,12 +1,14 @@
{ stdenv, fetchurl, buildOcaml, ocsigen-toolkit, eliom, ocaml_pcre, pgocaml, macaque, safepass, yojson, ojquery, magick, ocsigen_deriving, ocsigen_server }:
{ stdenv, fetchurl, buildOcaml, ocsigen-toolkit, eliom, ocaml_pcre, pgocaml, macaque, safepass, yojson, ocsigen_deriving, ocsigen_server
, js_of_ocaml-camlp4
}:
buildOcaml rec
{
name = "ocsigen-start";
version = "1.0.0";
version = "1.1.0";
buildInputs = [ eliom ];
propagatedBuildInputs = [ pgocaml macaque safepass ocaml_pcre ocsigen-toolkit yojson ojquery ocsigen_deriving ocsigen_server magick ];
buildInputs = [ eliom js_of_ocaml-camlp4 ];
propagatedBuildInputs = [ pgocaml macaque safepass ocaml_pcre ocsigen-toolkit yojson ocsigen_deriving ocsigen_server ];
patches = [ ./templates-dir.patch ];
@ -16,7 +18,7 @@ buildOcaml rec
src = fetchurl {
url = "https://github.com/ocsigen/${name}/archive/${version}.tar.gz";
sha256 = "0npc2iq39ixci6ly0fssklv07zqi5cfa1adad4hm8dbzjawkqqll";
sha256 = "09cw6qzcld0m1qm66mbjg9gw8l6dynpw3fzhm3kfx5ldh0afgvjq";
};
createFindlibDestdir = true;

12
pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix
View file

@ -1,15 +1,15 @@
{ stdenv, fetchurl, buildOcaml, ocaml, eliom, opam }:
{ stdenv, fetchurl, buildOcaml, ocaml, opam
, calendar, eliom, js_of_ocaml-ppx_deriving_json
}:
buildOcaml rec
{
name = "ocsigen-toolkit";
version = "1.0.0";
version = "1.1.0";
propagatedBuildInputs = [ eliom ];
propagatedBuildInputs = [ calendar eliom js_of_ocaml-ppx_deriving_json ];
buildInputs = [ opam ];
createFindlibDestdir = true;
installPhase =
''
export OCAMLPATH=$out/lib/ocaml/${ocaml.version}/site-lib/:$OCAMLPATH
@ -18,7 +18,7 @@ buildOcaml rec
'';
src = fetchurl {
sha256 = "0wm4fnss7vlkd03ybgfrk63kpip6m6p6kdqjn3f64n11256mwzj2";
sha256 = "1i5806gaqqllgsgjz3lf9fwlffqg3vfl49msmhy7xvq2sncbxp8a";
url = "https://github.com/ocsigen/${name}/archive/${version}.tar.gz";
};

7
pkgs/top-level/ocaml-packages.nix
View file

@ -217,10 +217,7 @@ let
easy-format = callPackage ../development/ocaml-modules/easy-format { };
eliom = callPackage ../development/ocaml-modules/eliom {
lwt = lwt2;
js_of_ocaml = js_of_ocaml_2;
};
eliom = callPackage ../development/ocaml-modules/eliom { };
enumerate = callPackage ../development/ocaml-modules/enumerate { };
@ -504,7 +501,7 @@ let
ocplib-simplex = callPackage ../development/ocaml-modules/ocplib-simplex { };
ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { lwt = lwt2; };
ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { };
ocsigen-start = callPackage ../development/ocaml-modules/ocsigen-start { };