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

OCaml modules: make explicit some dependencies to ocamlbuild

Browse Source
This commit is contained in:
Vincent Laporte 2016-10-09 20:10:46 +02:00
parent f97d5ae81f
commit cc272dc996
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ocaml, findlib, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm }: { stdenv, fetchurl, ocaml, findlib, ocamlbuild, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gapi-ocaml-0.2.10"; name = "gapi-ocaml-0.2.10";
@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
url = "https://forge.ocamlcore.org/frs/download.php/1601/${name}.tar.gz"; url = "https://forge.ocamlcore.org/frs/download.php/1601/${name}.tar.gz";
sha256 = "0kg4j7dhr7jynpy8x53bflqjf78jyl14j414l6px34xz7c9qx5fl"; sha256 = "0kg4j7dhr7jynpy8x53bflqjf78jyl14j414l6px34xz7c9qx5fl";
}; };
buildInputs = [ ocaml findlib ]; buildInputs = [ ocaml findlib ocamlbuild ];
propagatedBuildInputs = [ ocurl cryptokit ocaml_extlib yojson ocamlnet xmlm ]; propagatedBuildInputs = [ ocurl cryptokit ocaml_extlib yojson ocamlnet xmlm ];
configurePhase = "ocaml setup.ml -configure --prefix $out"; configurePhase = "ocaml setup.ml -configure --prefix $out";

4
pkgs/development/ocaml-modules/lambda-term/1.6.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, libev, ocaml, findlib, ocaml_lwt, ocaml_react, zed, camlp4 }: { stdenv, fetchurl, libev, ocaml, findlib, ocamlbuild, ocaml_lwt, ocaml_react, zed, camlp4 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.6"; version = "1.6";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1rhfixdgpylxznf6sa9wr31wb4pjzpfn5mxhxqpbchmpl2afwa09"; sha256 = "1rhfixdgpylxznf6sa9wr31wb4pjzpfn5mxhxqpbchmpl2afwa09";
}; };
buildInputs = [ libev ocaml findlib ocaml_lwt ocaml_react ]; buildInputs = [ libev ocaml findlib ocamlbuild ocaml_lwt ocaml_react ];
propagatedBuildInputs = [ camlp4 zed ]; propagatedBuildInputs = [ camlp4 zed ];

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, libev, ocaml, findlib, ocaml_lwt, ocaml_react, zed }: { stdenv, fetchurl, libev, ocaml, findlib, ocamlbuild, ocaml_lwt, ocaml_react, zed }:
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01"; assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1kwpsqds51xmy3z3ddkam92hkl7arlzy9awhzsq62ysxcl91fb8m"; sha256 = "1kwpsqds51xmy3z3ddkam92hkl7arlzy9awhzsq62ysxcl91fb8m";
}; };
buildInputs = [ libev ocaml findlib ocaml_react ]; buildInputs = [ libev ocaml findlib ocamlbuild ocaml_react ];
propagatedBuildInputs = [ zed ocaml_lwt ]; propagatedBuildInputs = [ zed ocaml_lwt ];

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

@ -1,4 +1,4 @@
{ stdenv, fetchzip, which, cryptopp, ocaml, findlib, ocaml_react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, ocaml_text, glib, camlp4, ppx_tools }: { stdenv, fetchzip, which, cryptopp, ocaml, findlib, ocamlbuild, ocaml_react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, ocaml_text, glib, camlp4, ppx_tools }:
let let
inherit (stdenv.lib) optional getVersion versionAtLeast; inherit (stdenv.lib) optional getVersion versionAtLeast;
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "0gmhm282r8yi0gwcv0g2s7qchkfjmhqbqf4j9frlyv665ink9kxl"; sha256 = "0gmhm282r8yi0gwcv0g2s7qchkfjmhqbqf4j9frlyv665ink9kxl";
}; };
buildInputs = [ ocaml_oasis pkgconfig which cryptopp ocaml findlib glib ncurses camlp4 ppx_tools ]; buildInputs = [ ocaml_oasis pkgconfig which cryptopp ocaml findlib ocamlbuild glib ncurses camlp4 ppx_tools ];
propagatedBuildInputs = [ ocaml_react ocaml_ssl ocaml_text libev ]; propagatedBuildInputs = [ ocaml_react ocaml_ssl ocaml_text libev ];

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ocaml, findlib, uutf, lwt }: { stdenv, fetchurl, ocaml, findlib, ocamlbuild, uutf, lwt }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ocaml-markup"; pname = "ocaml-markup";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "0d3wi22v7h0iqzq8dgl0g4fj2wb67gvmbzdckacifghinrx762k3"; sha256 = "0d3wi22v7h0iqzq8dgl0g4fj2wb67gvmbzdckacifghinrx762k3";
}; };
buildInputs = [ocaml findlib]; buildInputs = [ ocaml findlib ocamlbuild ];
installPhase = "make ocamlfind-install"; installPhase = "make ocamlfind-install";

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ocaml, findlib, ocaml_oasis, camlp4, uutf, markup, ppx_tools, re }: { stdenv, fetchurl, ocaml, findlib, ocamlbuild, ocaml_oasis, camlp4, uutf, markup, ppx_tools, re }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "tyxml"; pname = "tyxml";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1rz0f48x8p1m30723rn5v85pp7rd0spr04sd7gzryy99vn3ianga"; sha256 = "1rz0f48x8p1m30723rn5v85pp7rd0spr04sd7gzryy99vn3ianga";
}; };
buildInputs = [ocaml findlib camlp4]; buildInputs = [ ocaml findlib ocamlbuild camlp4 ];
propagatedBuildInputs = [uutf re ppx_tools markup]; propagatedBuildInputs = [uutf re ppx_tools markup];

6
pkgs/development/tools/ocaml/utop/default.nix
View File

@ -1,5 +1,5 @@
{stdenv, fetchurl, ocaml, findlib, lambdaTerm, ocaml_lwt, makeWrapper, { stdenv, fetchurl, ocaml, findlib, ocamlbuild, camlp4, ocaml_react
ocaml_react, camomile, zed, cppo, camlp4, ppx_tools , lambdaTerm, ocaml_lwt, makeWrapper, camomile, zed, cppo, ppx_tools
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0hxybkqmrh0sz1yyyrgzdmxp46gda4vk22pv07s0qpfg2dpv56jh"; sha256 = "0hxybkqmrh0sz1yyyrgzdmxp46gda4vk22pv07s0qpfg2dpv56jh";
}; };
buildInputs = [ ocaml findlib makeWrapper cppo camlp4 ppx_tools ]; buildInputs = [ ocaml findlib ocamlbuild makeWrapper cppo camlp4 ppx_tools ];
propagatedBuildInputs = [ lambdaTerm ocaml_lwt ]; propagatedBuildInputs = [ lambdaTerm ocaml_lwt ];