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

Merge pull request #4517 from FlorentBecker/eliom 

ocsigen 2014-10
This commit is contained in:
Michael Raskin 2014-11-04 12:41:59 +03:00
parent fe624050e8 10eb4786fd
commit c874dc7d9d
5 changed files with 42 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,30 +1,34 @@
{ stdenv, fetchurl, ocaml, findlib, which, ocsigen_server, ocsigen_deriving, { stdenv, fetchurl, ocaml, findlib, which, ocsigen_server, ocsigen_deriving,
js_of_ocaml, ocaml_react, ocaml_lwt, calendar, cryptokit, tyxml, js_of_ocaml, ocaml_react, ocaml_lwt, calendar, cryptokit, tyxml,
ocaml_ipaddr, ocamlnet, ocaml_ssl, ocaml_pcre, ocaml_optcomp}: ocaml_ipaddr, ocamlnet, ocaml_ssl, ocaml_pcre, ocaml_optcomp,
reactivedata, opam}:
stdenv.mkDerivation stdenv.mkDerivation rec
{ {
name = "eliom-4.0.0"; pname = "eliom";
version = "4.1.0";
name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = https://github.com/ocsigen/eliom/archive/4.0.0.tar.gz; url = https://github.com/ocsigen/eliom/archive/4.1.0.tar.gz;
sha256 = "1xf2l6lvngxzwaw6lvr6sgi48rz0wxg65q9lz4jzqjarkp0sx206"; sha256 = "10v7mrq3zsbxdlg8k8xif777mbvcdpabvnd1g7p2yqivr7f1qm24";
}; };
buildInputs = [ocaml which ocsigen_server findlib ocsigen_deriving buildInputs = [ocaml which ocsigen_server findlib ocsigen_deriving
js_of_ocaml ocaml_react ocaml_lwt calendar js_of_ocaml ocaml_optcomp opam];
cryptokit tyxml ocaml_ipaddr ocamlnet ocaml_ssl
ocaml_pcre ocaml_optcomp];
preConfigure = propagatedBuildInputs = [ ocaml_lwt reactivedata tyxml ocaml_ipaddr
''chmod a+x configure calendar cryptokit ocamlnet ocaml_react ocaml_ssl
sed s/deriving-ocsigen/deriving/g -i configure ocaml_pcre ];
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/
''; '';
configureFlags = "--root $(out) --prefix /";
dontAddPrefix = true;
createFindlibDestdir = true; createFindlibDestdir = true;
meta = { meta = {

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

@ -1,14 +1,18 @@
{stdenv, fetchurl, ocaml, findlib, which, ocaml_react, ocaml_ssl, ocaml_lwt, ocamlnet, ocaml_pcre, cryptokit, tyxml, ocaml_ipaddr, zlib, libev, openssl, ocaml_sqlite3, tree}: {stdenv, fetchurl, ocaml, findlib, which, ocaml_react, ocaml_ssl,
ocaml_lwt, ocamlnet, ocaml_pcre, cryptokit, tyxml, ocaml_ipaddr, zlib,
libev, openssl, ocaml_sqlite3, tree, uutf}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ocsigenserver-2.4.0"; name = "ocsigenserver-2.5";
src = fetchurl { src = fetchurl {
url = https://github.com/ocsigen/ocsigenserver/archive/2.4.0.tar.gz; url = https://github.com/ocsigen/ocsigenserver/archive/2.5.tar.gz;
sha256 = "1fjj8g6ivyfsa0446w77rjihhbw0gh5pgx7brywql2shk999riby"; sha256 = "0ayzlzjwg199va4sclsldlcp0dnwdj45ahhg9ckb51m28c2pw46r";
}; };
buildInputs = [ocaml which findlib ocaml_react ocaml_ssl ocaml_lwt ocamlnet ocaml_pcre cryptokit tyxml ocaml_ipaddr zlib libev openssl ocaml_sqlite3 tree]; buildInputs = [ocaml which findlib ocaml_react ocaml_ssl ocaml_lwt
ocamlnet ocaml_pcre cryptokit tyxml ocaml_ipaddr zlib libev openssl
ocaml_sqlite3 tree uutf];
configureFlags = "--root $(out) --prefix /"; configureFlags = "--root $(out) --prefix /";

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

@ -1,15 +1,17 @@
{stdenv, fetchurl, ocaml, findlib, ocaml_oasis, camlp4}: {stdenv, fetchurl, ocaml, findlib, ocaml_oasis, camlp4, uutf}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "tyxml-3.1.1"; name = "tyxml-3.3.0";
src = fetchurl { src = fetchurl {
url = http://github.com/ocsigen/tyxml/archive/3.1.1.tar.gz; url = http://github.com/ocsigen/tyxml/archive/3.3.0.tar.gz;
sha256 = "1r8im382r68kn8qy0857nv3y7h42i6ajyclxzmigfai7v2xdd05z"; sha256 = "0r1hj8qy91i48nd7wj0x2dqrgspqrry5awraxl4pl10vh0mn6pk7";
}; };
buildInputs = [ocaml findlib ocaml_oasis camlp4]; buildInputs = [ocaml findlib ocaml_oasis camlp4];
propagatedBuildInputs = [uutf];
createFindlibDestdir = true; createFindlibDestdir = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {

2
pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff
View File

@ -3,7 +3,7 @@
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
# Where binaries are installed: # Where binaries are installed:
-BINDIR := /usr/local/bin -BINDIR := `dirname \`which ocamlc\``
+BINDIR := $(out)/bin +BINDIR := $(out)/bin
#### ####

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

@ -1,13 +1,15 @@
{stdenv, fetchurl, ocaml, findlib, ocaml_lwt, menhir, ocsigen_deriving}: {stdenv, fetchurl, ocaml, findlib, ocaml_lwt, menhir, ocsigen_deriving, camlp4,
cmdliner, tyxml, reactivedata}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "js_of_ocaml"; name = "js_of_ocaml-2.5";
src = fetchurl { src = fetchurl {
url = https://github.com/ocsigen/js_of_ocaml/archive/2.2.tar.gz; url = https://github.com/ocsigen/js_of_ocaml/archive/2.5.tar.gz;
sha256 = "1cp81gpvyxgvzxg0vzyl8aa2zvcixp6m433w8zjifrg6vb7lhp97"; sha256 = "1prm08nf8szmd3p13ysb0yx1cy6lr671bnwsp25iny8hfbs39sjv";
}; };
buildInputs = [ocaml findlib ocaml_lwt menhir ocsigen_deriving]; buildInputs = [ocaml findlib ocaml_lwt menhir ocsigen_deriving
cmdliner tyxml camlp4 reactivedata];
patches = [ ./Makefile.conf.diff ]; patches = [ ./Makefile.conf.diff ];