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 11:55:19 +02:00
parent 731b616fdb
commit 4168706d4f
61 changed files with 125 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/ocaml/cppo/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, ocaml, findlib }:
{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild }:
let
pname = "cppo";
version = "1.3.2";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
sha256 = "06j0zr78f04ahxi2459vjn61z25hkvs4dfj76200ydg3g6ifb3k1";
};
buildInputs = [ ocaml findlib ];
buildInputs = [ ocaml findlib ocamlbuild ];
createFindlibDestdir = true;
pkgs/development/tools/ocaml/oasis/0.4.6.nix
+4 -3
View File
@@ -1,5 +1,6 @@
{stdenv, fetchurl, ocaml, findlib, ocaml_data_notation, type_conv, camlp4,
ocamlmod, ocamlify, ounit, expect}:
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, camlp4
, ocaml_data_notation, type_conv, ocamlmod, ocamlify, ounit, expect
}:
stdenv.mkDerivation {
name = "ocaml-oasis-0.4.6";
@@ -13,7 +14,7 @@ stdenv.mkDerivation {
buildInputs =
[
ocaml findlib type_conv ocamlmod ocamlify ounit camlp4
ocaml findlib ocamlbuild type_conv ocamlmod ocamlify ounit camlp4
];
propagatedBuildInputs = [ ocaml_data_notation ];
pkgs/development/tools/ocaml/oasis/default.nix
+4 -3
View File
@@ -1,5 +1,6 @@
{stdenv, fetchurl, ocaml, findlib, ocaml_data_notation, type_conv, camlp4,
ocamlmod, ocamlify, ounit, expect}:
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, camlp4
, ocaml_data_notation, type_conv, ocamlmod, ocamlify, ounit, expect
}:
stdenv.mkDerivation rec {
version = "0.4.7";
@@ -16,7 +17,7 @@ stdenv.mkDerivation rec {
buildInputs =
[
ocaml findlib type_conv ocamlmod ocamlify ounit camlp4
ocaml findlib ocamlbuild type_conv ocamlmod ocamlify ounit camlp4
];
propagatedBuildInputs = [ ocaml_data_notation ];
pkgs/development/tools/ocaml/ocamlify/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, ocaml, findlib}:
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild }:
stdenv.mkDerivation {
name = "ocamlify-0.0.2";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "1f0fghvlbfryf5h3j4as7vcqrgfjb4c8abl5y0y5h069vs4kp5ii";
};
buildInputs = [ocaml findlib];
buildInputs = [ ocaml findlib ocamlbuild ];
configurePhase = "ocaml setup.ml -configure --prefix $out";
buildPhase = "ocaml setup.ml -build";
pkgs/development/tools/ocaml/ocamlmod/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, ocaml, findlib}:
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild }:
stdenv.mkDerivation rec {
name = "ocamlmod-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1w0w8lfyymvk300dv13gvhrddpcyknvyp4g2yvq2vaw7khkhjs9g";
};
buildInputs = [ocaml findlib];
buildInputs = [ ocaml findlib ocamlbuild ];
configurePhase = "ocaml setup.ml -configure --prefix $out";
buildPhase = "ocaml setup.ml -build";