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

Merge pull request #19765 from FlorentBecker/some_buildOcaml

Browse Source 
Update various packages to use buildOcaml, with fixes
This commit is contained in:
Michael Raskin 2016-12-30 20:47:50 +00:00 committed by GitHub
commit 6f12fb7403
3 changed files with 21 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,15 +1,10 @@
{ stdenv, fetchurl, ocaml, findlib, which, ocsigen_server, ocsigen_deriving,
{ buildOcaml, stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml,
js_of_ocaml, ocaml_react, ocaml_lwt, calendar, cryptokit, tyxml,
ipaddr, ocamlnet, ocaml_ssl, ocaml_pcre, ocaml_optcomp,
reactivedata, opam, ppx_tools, camlp4}:
reactivedata, opam, ppx_tools, ppx_deriving, camlp4}:
let ocamlVersion = (stdenv.lib.getVersion ocaml);
in
(
assert stdenv.lib.versionAtLeast ocamlVersion "4";
stdenv.mkDerivation rec
let ocamlVersion = (stdenv.lib.getVersion ocaml); in
buildOcaml rec
{
pname = "eliom";
version = "5.0.0";
@ -22,12 +17,11 @@ stdenv.mkDerivation rec
patches = [ ./camlp4.patch ];
buildInputs = [ocaml which ocsigen_server findlib ocsigen_deriving
js_of_ocaml ocaml_optcomp opam ppx_tools camlp4 ];
buildInputs = [ which ocaml_optcomp opam ppx_tools camlp4 ];
propagatedBuildInputs = [ ocaml_lwt reactivedata tyxml ipaddr
calendar cryptokit ocamlnet ocaml_react ocaml_ssl
ocaml_pcre ];
propagatedBuildInputs = [ ocaml_lwt reactivedata tyxml ipaddr ocsigen_server ppx_deriving
ocsigen_deriving js_of_ocaml
calendar cryptokit ocamlnet ocaml_react ocaml_ssl ocaml_pcre ];
preConfigure = stdenv.lib.optionalString (!stdenv.lib.versionAtLeast ocamlVersion "4.02") ''
export PPX=false
@ -57,8 +51,6 @@ stdenv.mkDerivation rec
license = stdenv.lib.licenses.lgpl21;
platforms = ocaml.meta.platforms or [];
maintainers = [ stdenv.lib.maintainers.gal_bolle ];
};
})
}

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

@ -1,14 +1,17 @@
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, camlp4, calendar, csv, ocaml_pcre }:
{ stdenv, fetchurl, buildOcaml, calendar, csv, re }:
stdenv.mkDerivation {
name = "ocaml-pgocaml-2.2";
buildOcaml {
name = "pgocaml";
version = "2.3";
src = fetchurl {
url = http://forge.ocamlcore.org/frs/download.php/1506/pgocaml-2.2.tgz;
sha256 = "0x0dhlz2rqxpwfdqi384f9fn0ng2irifadmxfm2b4gcz7y1cl9rh";
url = https://github.com/darioteixeira/pgocaml/archive/v2.3.tar.gz;
sha256 = "18lymxlvcf4nwxawkidq3pilsp5rhl0l8ifq6pjk3ssjlx9w53pg";
};
buildInputs = [ ocaml findlib ocamlbuild camlp4 ];
propagatedBuildInputs = [ calendar csv ocaml_pcre ];
buildInputs = [ ];
propagatedBuildInputs = [ calendar csv re ];
configureFlags = [ "--enable-p4" ];
createFindlibDestdir = true;
@ -16,7 +19,6 @@ stdenv.mkDerivation {
description = "An interface to PostgreSQL databases for OCaml applications";
homepage = http://pgocaml.forge.ocamlcore.org/;
license = licenses.lgpl2;
platforms = ocaml.meta.platforms or [];
maintainers = with maintainers; [ vbgl ];
};
}

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

@ -8,9 +8,9 @@ stdenv.mkDerivation {
sha256 = "1dali1akyd4zmkwav0d957ynxq2jj6cc94r4xiaql7ca89ajz4jj";
};
buildInputs = [ ocaml findlib menhir ocsigen_deriving ppx_deriving
buildInputs = [ ocaml findlib menhir ocsigen_deriving
cmdliner tyxml reactivedata cppo which base64];
propagatedBuildInputs = [ ocaml_lwt camlp4 ];
propagatedBuildInputs = [ ocaml_lwt camlp4 ppx_deriving ];
patches = [ ./Makefile.conf.diff ];