Merge branch 'master' into staging
Hydra: ?compare=1399476
This commit is contained in:
Vladimír Čunát
36
pkgs/development/ocaml-modules/biniou/1.0.nix
Normal file
36
pkgs/development/ocaml-modules/biniou/1.0.nix
Normal file
@@ -0,0 +1,36 @@
|
||||
{stdenv, fetchurl, ocaml, findlib, easy-format}:
|
||||
let
|
||||
pname = "biniou";
|
||||
version = "1.0.9";
|
||||
webpage = "http://mjambon.com/${pname}.html";
|
||||
in
|
||||
|
||||
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11";
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://mjambon.com/releases/${pname}/${name}.tar.gz";
|
||||
sha256 = "14j3hrhbjqxbizr1pr8fcig9dmfzhbjjwzwyc99fcsdic67w8izb";
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml findlib easy-format ];
|
||||
|
||||
createFindlibDestdir = true;
|
||||
|
||||
makeFlags = "PREFIX=$(out)";
|
||||
|
||||
preBuild = ''
|
||||
mkdir $out/bin
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve";
|
||||
homepage = "${webpage}";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.vbgl ];
|
||||
platforms = ocaml.meta.platforms or [];
|
||||
};
|
||||
}
|
||||
@@ -1,36 +1,26 @@
|
||||
{stdenv, fetchurl, ocaml, findlib, easy-format}:
|
||||
let
|
||||
pname = "biniou";
|
||||
version = "1.0.9";
|
||||
webpage = "http://mjambon.com/${pname}.html";
|
||||
in
|
||||
|
||||
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11";
|
||||
{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, easy-format }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.2.0";
|
||||
name = "ocaml${ocaml.version}-biniou-${version}";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mjambon";
|
||||
repo = "biniou";
|
||||
rev = "v${version}";
|
||||
sha256 = "0mjpgwyfq2b2izjw0flmlpvdjgqpq8shs89hxj1np2r50csr8dcb";
|
||||
};
|
||||
|
||||
name = "${pname}-${version}";
|
||||
buildInputs = [ ocaml findlib jbuilder ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://mjambon.com/releases/${pname}/${name}.tar.gz";
|
||||
sha256 = "14j3hrhbjqxbizr1pr8fcig9dmfzhbjjwzwyc99fcsdic67w8izb";
|
||||
};
|
||||
propagatedBuildInputs = [ easy-format ];
|
||||
|
||||
buildInputs = [ ocaml findlib easy-format ];
|
||||
inherit (jbuilder) installPhase;
|
||||
|
||||
createFindlibDestdir = true;
|
||||
|
||||
makeFlags = "PREFIX=$(out)";
|
||||
|
||||
preBuild = ''
|
||||
mkdir $out/bin
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve";
|
||||
homepage = "${webpage}";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.vbgl ];
|
||||
platforms = ocaml.meta.platforms or [];
|
||||
};
|
||||
meta = {
|
||||
inherit (src.meta) homepage;
|
||||
inherit (ocaml.meta) platforms;
|
||||
description = "Binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve";
|
||||
maintainers = [ stdenv.lib.maintainers.vbgl ];
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml,
|
||||
js_of_ocaml, react, lwt, calendar, cryptokit, tyxml,
|
||||
ipaddr, ocamlnet, ocaml_ssl, ocaml_pcre, ocaml_optcomp,
|
||||
ipaddr, ocamlnet, ssl, ocaml_pcre, ocaml_optcomp,
|
||||
reactivedata, opam, ppx_tools, ppx_deriving, findlib
|
||||
, ocamlbuild
|
||||
}:
|
||||
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec
|
||||
|
||||
propagatedBuildInputs = [ lwt reactivedata tyxml ipaddr ocsigen_server ppx_deriving
|
||||
ocsigen_deriving js_of_ocaml
|
||||
calendar cryptokit ocamlnet react ocaml_ssl ocaml_pcre ];
|
||||
calendar cryptokit ocamlnet react ssl ocaml_pcre ];
|
||||
|
||||
installPhase = "opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR";
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ stdenv, buildOcaml, fetchzip, which, cryptopp, ocaml, findlib, ocamlbuild, camlp4
|
||||
, react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, glib
|
||||
, react, ssl, libev, pkgconfig, ncurses, ocaml_oasis, glib
|
||||
, ppx_tools, result, cppo
|
||||
, ppxSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02"
|
||||
, version ? if stdenv.lib.versionAtLeast ocaml.version "4.02" then "2.7.1" else "2.6.0"
|
||||
@@ -31,7 +31,7 @@ buildOcaml rec {
|
||||
++ stdenv.lib.optional ppxSupport ppx_tools;
|
||||
|
||||
propagatedBuildInputs = [ result ]
|
||||
++ optionals [ react ocaml_ssl ]
|
||||
++ optionals [ react ssl ]
|
||||
++ [ libev ];
|
||||
|
||||
configureScript = "ocaml setup.ml -configure";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{stdenv, fetchurl, ocaml, findlib, which, react, ocaml_ssl,
|
||||
{ stdenv, fetchurl, ocaml, findlib, which, react, ssl,
|
||||
lwt, ocamlnet, ocaml_pcre, cryptokit, tyxml, ipaddr, zlib,
|
||||
libev, openssl, ocaml_sqlite3, tree, uutf, makeWrapper, camlp4
|
||||
, camlzip, pgocaml
|
||||
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
|
||||
sha256 = "1v44qv2ixd7i1qinyhlzzqiffawsdl7xhhh6ysd7lf93kh46d5sy";
|
||||
};
|
||||
|
||||
buildInputs = [ocaml which findlib react ocaml_ssl lwt
|
||||
buildInputs = [ocaml which findlib react ssl lwt
|
||||
ocamlnet ocaml_pcre cryptokit tyxml ipaddr zlib libev openssl
|
||||
ocaml_sqlite3 tree uutf makeWrapper camlp4 pgocaml camlzip ];
|
||||
|
||||
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
|
||||
''
|
||||
rm -rf $out/var/run
|
||||
wrapProgram $out/bin/ocsigenserver \
|
||||
--prefix CAML_LD_LIBRARY_PATH : "${mkpath ocaml_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"}:${mkpath lwt "lwt"}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath cryptokit "cryptokit"}:${mkpath ocaml_sqlite3 "sqlite3"}"
|
||||
'';
|
||||
|
||||
dontPatchShebangs = true;
|
||||
|
||||
@@ -2,13 +2,23 @@
|
||||
|
||||
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12";
|
||||
|
||||
let param =
|
||||
if stdenv.lib.versionAtLeast ocaml.version "4.02"
|
||||
then {
|
||||
version = "20171003";
|
||||
sha256 = "06zwsskri8kaqjdszj9360nf36zvwh886xwf033aija8c9k4w6cx";
|
||||
} else {
|
||||
version = "20140424";
|
||||
sha256 = "0sc9q89dnyarcg24czyhr6ams0ylqvia3745s6rfwd2nldpygsdk";
|
||||
}; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
||||
name = "ocaml-pprint-20140424";
|
||||
name = "ocaml${ocaml.version}-pprint-${param.version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://gallium.inria.fr/~fpottier/pprint/pprint-20140424.tar.gz;
|
||||
sha256 = "0sc9q89dnyarcg24czyhr6ams0ylqvia3745s6rfwd2nldpygsdk";
|
||||
url = "http://gallium.inria.fr/~fpottier/pprint/pprint-${param.version}.tar.gz";
|
||||
inherit (param) sha256;
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml findlib ocamlbuild ];
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ocaml${ocaml.version}-ssl-${version}";
|
||||
version = "0.5.3";
|
||||
version = "0.5.4";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/savonet/ocaml-ssl/releases/download/0.5.3/ocaml-ssl-${version}.tar.gz";
|
||||
sha256 = "0h2k19zpdvq1gqwrmmgkibw4j48l71vv6ajzxs0wi71y80c1vhwm";
|
||||
url = "https://github.com/savonet/ocaml-ssl/releases/download/${version}/ocaml-ssl-${version}.tar.gz";
|
||||
sha256 = "01sy3f94b463ff7dmkfsv67jh8g8h20wh7npjwqilniif7lgf4l3";
|
||||
};
|
||||
|
||||
buildInputs = [which ocaml findlib];
|
||||
|
||||
Reference in New Issue
Block a user