diff options
author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2016-10-08 08:44:25 +0200 |
---|---|---|
committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2016-10-09 11:55:19 +0200 |
commit | 4168706d4fd35dc9c83d22725bede9b97b87750b (patch) | |
tree | ce23665cd16bf9429db01b34037b37be7d795a18 | |
parent | 731b616fdbb7b3b0d753f5ac05926de33d17c177 (diff) | |
download | nixpkgs-4168706d4fd35dc9c83d22725bede9b97b87750b.tar nixpkgs-4168706d4fd35dc9c83d22725bede9b97b87750b.tar.gz nixpkgs-4168706d4fd35dc9c83d22725bede9b97b87750b.tar.bz2 nixpkgs-4168706d4fd35dc9c83d22725bede9b97b87750b.tar.lz nixpkgs-4168706d4fd35dc9c83d22725bede9b97b87750b.tar.xz nixpkgs-4168706d4fd35dc9c83d22725bede9b97b87750b.tar.zst nixpkgs-4168706d4fd35dc9c83d22725bede9b97b87750b.zip |
OCaml modules: make explicit some dependencies to ocamlbuild
61 files changed, 125 insertions, 123 deletions
diff --git a/pkgs/build-support/ocaml/default.nix b/pkgs/build-support/ocaml/default.nix index 54951dadf56..cc2001c66e2 100644 --- a/pkgs/build-support/ocaml/default.nix +++ b/pkgs/build-support/ocaml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, writeText, ocaml, findlib, camlp4 }: +{ stdenv, writeText, ocaml, findlib, ocamlbuild, camlp4 }: { name, version, buildInputs ? [], createFindlibDestdir ? true, @@ -19,7 +19,7 @@ in stdenv.mkDerivation (args // { name = "ocaml-${name}-${version}"; - buildInputs = [ ocaml findlib camlp4 ] ++ buildInputs; + buildInputs = [ ocaml findlib ocamlbuild camlp4 ] ++ buildInputs; setupHook = if setupHook == null && hasSharedObjects then writeText "setupHook.sh" '' diff --git a/pkgs/development/compilers/mezzo/default.nix b/pkgs/development/compilers/mezzo/default.nix index 67e7c932e55..79dc479fae8 100644 --- a/pkgs/development/compilers/mezzo/default.nix +++ b/pkgs/development/compilers/mezzo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, menhir, yojson, ulex, pprint, fix, functory }: +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, menhir, yojson, ulex, pprint, fix, functory }: let check-ocaml-version = with stdenv.lib; versionAtLeast (getVersion ocaml); @@ -17,7 +17,7 @@ stdenv.mkDerivation { sha256 = "0yck5r6di0935s3iy2mm9538jkf77ssr789qb06ms7sivd7g3ip6"; }; - buildInputs = [ ocaml findlib yojson menhir ulex pprint fix functory ]; + buildInputs = [ ocaml findlib ocamlbuild yojson menhir ulex pprint fix functory ]; # Sets warning 3 as non-fatal prePatch = stdenv.lib.optionalString (check-ocaml-version "4.02") '' diff --git a/pkgs/development/interpreters/eff/default.nix b/pkgs/development/interpreters/eff/default.nix index 566d7025e5c..9fc25ad46fd 100644 --- a/pkgs/development/interpreters/eff/default.nix +++ b/pkgs/development/interpreters/eff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, ocaml, findlib, menhir, which }: +{ stdenv, fetchgit, ocaml, findlib, ocamlbuild, menhir, which }: let inherit (stdenv.lib) getVersion versionAtLeast; in @@ -14,7 +14,7 @@ stdenv.mkDerivation { sha256 = "0cqqrpvfw0nrk5d28mkzfvc8yzqxcss0k46bkmqhqjkqq886n2mm"; }; - buildInputs = [ ocaml findlib menhir which ]; + buildInputs = [ ocaml findlib ocamlbuild menhir which ]; doCheck = true; checkTarget = "test"; diff --git a/pkgs/development/ocaml-modules/ansiterminal/default.nix b/pkgs/development/ocaml-modules/ansiterminal/default.nix index 615e1d1b673..7edd0ddda5e 100644 --- a/pkgs/development/ocaml-modules/ansiterminal/default.nix +++ b/pkgs/development/ocaml-modules/ansiterminal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild }: stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1j9kflv2i16vf9hy031cl6z8hv6791mjbhnd9bw07y1pswdlx1r6"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; configurePhase = "ocaml setup.ml -configure --prefix $out"; diff --git a/pkgs/development/ocaml-modules/base64/default.nix b/pkgs/development/ocaml-modules/base64/default.nix index aabb9f8a76a..8128dc1cb6f 100644 --- a/pkgs/development/ocaml-modules/base64/default.nix +++ b/pkgs/development/ocaml-modules/base64/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }: let version = "2.0.0"; in @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "1nv55gwq5vaxmrcz9ja2s165b1p9fhcxszc1l76043gpa56qm4fs"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix index 0c01a946e5a..904a214c34f 100644 --- a/pkgs/development/ocaml-modules/batteries/default.nix +++ b/pkgs/development/ocaml-modules/batteries/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, qtest }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, qtest }: let version = "2.5.2"; in @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "01v7sp8vsqlfrmpji5pkrsjl43r3q8hk1a4z4lmyy9y2i0fqwl07"; }; - buildInputs = [ ocaml findlib qtest ]; + buildInputs = [ ocaml findlib ocamlbuild qtest ]; configurePhase = "true"; # Skip configure diff --git a/pkgs/development/ocaml-modules/bolt/default.nix b/pkgs/development/ocaml-modules/bolt/default.nix index cf8b21edb50..5d1fe8aa0d1 100644 --- a/pkgs/development/ocaml-modules/bolt/default.nix +++ b/pkgs/development/ocaml-modules/bolt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, which, camlp4 }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, which, camlp4 }: let inherit (stdenv.lib) getVersion versionAtLeast; in @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1c807wrpxra9sbb34lajhimwra28ldxv04m570567lh2b04n38zy"; }; - buildInputs = [ ocaml findlib which camlp4 ]; + buildInputs = [ ocaml findlib ocamlbuild which camlp4 ]; patchPhase = '' patch myocamlbuild.ml <<EOF diff --git a/pkgs/development/ocaml-modules/cil/default.nix b/pkgs/development/ocaml-modules/cil/default.nix index 1753084910b..99b5f92b340 100644 --- a/pkgs/development/ocaml-modules/cil/default.nix +++ b/pkgs/development/ocaml-modules/cil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, ocaml, findlib }: +{ stdenv, fetchurl, perl, ocaml, findlib, ocamlbuild }: stdenv.mkDerivation { name = "ocaml-cil-1.7.3"; src = fetchurl { @@ -6,7 +6,7 @@ stdenv.mkDerivation { sha256 = "05739da0b0msx6kmdavr3y2bwi92jbh3szc35d7d8pdisa8g5dv9"; }; - buildInputs = [ perl ocaml findlib ]; + buildInputs = [ perl ocaml findlib ocamlbuild ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/cmdliner/default.nix b/pkgs/development/ocaml-modules/cmdliner/default.nix index d72ff6d93d4..8be36a2a408 100644 --- a/pkgs/development/ocaml-modules/cmdliner/default.nix +++ b/pkgs/development/ocaml-modules/cmdliner/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, opam}: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }: let pname = "cmdliner"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; unpackCmd = "tar xjf $src"; - buildInputs = [ ocaml findlib opam ]; + buildInputs = [ ocaml findlib ocamlbuild opam ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/containers/default.nix b/pkgs/development/ocaml-modules/containers/default.nix index fbbf0fc7414..4719cd300c1 100644 --- a/pkgs/development/ocaml-modules/containers/default.nix +++ b/pkgs/development/ocaml-modules/containers/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, cppo, gen, sequence, qtest, ounit, ocaml_oasis, result +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, cppo, gen, sequence, qtest, ounit, ocaml_oasis, result , qcheck }: let @@ -21,7 +21,7 @@ stdenv.mkDerivation { sha256 = "169j8vqg8h70wbldjg610jqikfk23ggw8zypmpzv3piym5p1dfiw"; }; - buildInputs = [ ocaml findlib cppo gen sequence qtest ounit ocaml_oasis qcheck ]; + buildInputs = [ ocaml findlib ocamlbuild cppo gen sequence qtest ounit ocaml_oasis qcheck ]; propagatedBuildInputs = [ result ]; diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix index be61ad70b3d..461e2b88708 100644 --- a/pkgs/development/ocaml-modules/cryptokit/default.nix +++ b/pkgs/development/ocaml-modules/cryptokit/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, zlib, ocaml, findlib, ncurses}: +{ stdenv, fetchurl, zlib, ocaml, findlib, ocamlbuild, ncurses }: assert stdenv.lib.versionAtLeast ocaml.version "3.12"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1k2f2ixm7jcsgrzn9lz1hm9qqgq71lk9lxy3v3cwsd8xdrj3jrnv"; }; - buildInputs = [zlib ocaml findlib ncurses]; + buildInputs = [ zlib ocaml findlib ocamlbuild ncurses ]; buildFlags = "setup.data build"; diff --git a/pkgs/development/ocaml-modules/csv/default.nix b/pkgs/development/ocaml-modules/csv/default.nix index 760b981dd2c..95199f16dcc 100644 --- a/pkgs/development/ocaml-modules/csv/default.nix +++ b/pkgs/development/ocaml-modules/csv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }: stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "05s8py2qr3889c72g1q07r15pzch3j66xdphxi2sd93h5lvnpi4j"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/dolog/default.nix b/pkgs/development/ocaml-modules/dolog/default.nix index 5987c53898f..31835316833 100644 --- a/pkgs/development/ocaml-modules/dolog/default.nix +++ b/pkgs/development/ocaml-modules/dolog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }: let version = "3.0"; in @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "0gx2s4509vkkkaikl2yp7k5x7bqv45s1y1vsy408d8rakd7yl1zb"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/enumerate/default.nix b/pkgs/development/ocaml-modules/enumerate/default.nix index a9475649ff6..557f2f88d8d 100644 --- a/pkgs/development/ocaml-modules/enumerate/default.nix +++ b/pkgs/development/ocaml-modules/enumerate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, type_conv, camlp4 }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, type_conv, camlp4 }: assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "0b6mx5p01lcpimvak4wx6aj2119707wsfzd83rwgb91bhpgzh156"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; propagatedBuildInputs = [ type_conv camlp4 ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/erm_xml/default.nix b/pkgs/development/ocaml-modules/erm_xml/default.nix index ecfdb846ff1..ae264b657d8 100644 --- a/pkgs/development/ocaml-modules/erm_xml/default.nix +++ b/pkgs/development/ocaml-modules/erm_xml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }: let version = "0.3"; in @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "19znk5w0qiw3wij4n6w3h5bcr221yy57jf815fr8k9m8kin710g3"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/erm_xmpp/default.nix b/pkgs/development/ocaml-modules/erm_xmpp/default.nix index efa239f6c33..c6027ce11ce 100644 --- a/pkgs/development/ocaml-modules/erm_xmpp/default.nix +++ b/pkgs/development/ocaml-modules/erm_xmpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchzip, ocaml, findlib, erm_xml, cryptokit, camlp4 }: +{ stdenv, fetchurl, fetchzip, ocaml, findlib, ocamlbuild, erm_xml, cryptokit, camlp4 }: let version = "0.2"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { patches = [ disable-tests ]; - buildInputs = [ ocaml findlib camlp4 ]; + buildInputs = [ ocaml findlib ocamlbuild camlp4 ]; propagatedBuildInputs = [ erm_xml cryptokit ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/fileutils/default.nix b/pkgs/development/ocaml-modules/fileutils/default.nix index 3ffcfada3d5..9dfffbf48c5 100644 --- a/pkgs/development/ocaml-modules/fileutils/default.nix +++ b/pkgs/development/ocaml-modules/fileutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ounit }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ounit }: stdenv.mkDerivation { name = "ocaml-fileutils-0.5.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0xs96nlrrm335mcsgsxnqzspiqyfn26b0jjxm72br7c7ax534n47"; }; - buildInputs = [ ocaml findlib ounit ]; + buildInputs = [ ocaml findlib ocamlbuild ounit ]; configureFlags = "--enable-tests"; doCheck = true; diff --git a/pkgs/development/ocaml-modules/fix/default.nix b/pkgs/development/ocaml-modules/fix/default.nix index 77e2461bda0..76cb6d08844 100644 --- a/pkgs/development/ocaml-modules/fix/default.nix +++ b/pkgs/development/ocaml-modules/fix/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib}: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild }: assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1phlqcs1nb93x9cf0w0hnq2ck4dmn71zm4mxf60w96vb9yb9qzp0"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/gen/default.nix b/pkgs/development/ocaml-modules/gen/default.nix index 90f74b2c602..c023b590f7a 100644 --- a/pkgs/development/ocaml-modules/gen/default.nix +++ b/pkgs/development/ocaml-modules/gen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, qtest, ounit }: +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, ounit }: let version = "0.3"; in @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "0xrnkcfa5q86ammf49j5hynw5563x5sa2mk7vqf7g097j1szif72"; }; - buildInputs = [ ocaml findlib qtest ounit ]; + buildInputs = [ ocaml findlib ocamlbuild qtest ounit ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/gg/default.nix b/pkgs/development/ocaml-modules/gg/default.nix index 9351bfa7520..0839ff361ae 100644 --- a/pkgs/development/ocaml-modules/gg/default.nix +++ b/pkgs/development/ocaml-modules/gg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, opam }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }: let inherit (stdenv.lib) getVersion versionAtLeast; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "0czj41sr8jsivl3z8wyblf9k971j3kx2wc3s0c1nhzcc8allg9i2"; }; - buildInputs = [ ocaml findlib opam ]; + buildInputs = [ ocaml findlib ocamlbuild opam ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/iso8601/default.nix b/pkgs/development/ocaml-modules/iso8601/default.nix index 0aad6f7b13b..8a11d22c2c1 100644 --- a/pkgs/development/ocaml-modules/iso8601/default.nix +++ b/pkgs/development/ocaml-modules/iso8601/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }: let version = "0.2.4"; in @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "0ypdd1p04xdjxxx3b61wp7abswfrq3vcvwwaxvywxwqljw0dhydi"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; createFindlibDestdir = true; meta = { diff --git a/pkgs/development/ocaml-modules/jsonm/default.nix b/pkgs/development/ocaml-modules/jsonm/default.nix index cc5de781bee..f473527c15c 100644 --- a/pkgs/development/ocaml-modules/jsonm/default.nix +++ b/pkgs/development/ocaml-modules/jsonm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, uutf }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, uutf }: let version = "0.9.1"; in @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "0wszqrmx8iqlwzvs76fjf4sqh15mv20yjrbyhkd348yq8nhdrm1z"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; propagatedBuildInputs = [ uutf ]; unpackCmd = "tar xjf $src"; diff --git a/pkgs/development/ocaml-modules/macaque/default.nix b/pkgs/development/ocaml-modules/macaque/default.nix index a24859892fa..3d015e26275 100644 --- a/pkgs/development/ocaml-modules/macaque/default.nix +++ b/pkgs/development/ocaml-modules/macaque/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, pgocaml, camlp4 }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, pgocaml, camlp4 }: stdenv.mkDerivation { name = "ocaml-macaque-0.7.2"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "14i0a8cndzndjmlkyhf31r451q99cnkndgxcj0id4qjqhdl4bmjv"; }; - buildInputs = [ ocaml findlib camlp4 ]; + buildInputs = [ ocaml findlib ocamlbuild camlp4 ]; propagatedBuildInputs = [ pgocaml ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/magic-mime/default.nix b/pkgs/development/ocaml-modules/magic-mime/default.nix index 9c42aed37df..9a8a6259a77 100644 --- a/pkgs/development/ocaml-modules/magic-mime/default.nix +++ b/pkgs/development/ocaml-modules/magic-mime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }: let version = "1.0.0"; in @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "058d83hmxd5mjccxdm3ydchmhk2lca5jdg82jg0klsigmf4ida6v"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/menhir/default.nix b/pkgs/development/ocaml-modules/menhir/default.nix index 5b2fd400cd7..839a49615cd 100644 --- a/pkgs/development/ocaml-modules/menhir/default.nix +++ b/pkgs/development/ocaml-modules/menhir/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild , version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20160526" else "20140422" }@args: diff --git a/pkgs/development/ocaml-modules/menhir/generic.nix b/pkgs/development/ocaml-modules/menhir/generic.nix index c182d210049..9d4615a006b 100644 --- a/pkgs/development/ocaml-modules/menhir/generic.nix +++ b/pkgs/development/ocaml-modules/menhir/generic.nix @@ -1,4 +1,4 @@ -{ version, sha256, stdenv, fetchurl, ocaml, findlib }: +{ version, sha256, stdenv, fetchurl, ocaml, findlib, ocamlbuild }: stdenv.mkDerivation { name = "menhir-${version}"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { inherit sha256; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix index 204adeb9451..5b902afcb6d 100644 --- a/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, pkgconfig, cairo, lablgtk, gtk2, +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, pkgconfig, cairo, lablgtk, gtk2, enableGtkSupport ? true # Whether to compile with support for Gtk # integration (library file cairo2_gtk). Depends # on lablgtk and gtk2. @@ -19,7 +19,7 @@ stdenv.mkDerivation { sha256 = "1lc1iv5yz49avbc0wbrw9nrx8dn0c35r7cykivjln1zc2fwscf7w"; }; - buildInputs = [ ocaml findlib pkgconfig cairo ] + buildInputs = [ ocaml findlib ocamlbuild pkgconfig cairo ] ++ optionals enableGtkSupport [ gtk2 ]; # lablgtk2 is marked as a propagated build input since loading the diff --git a/pkgs/development/ocaml-modules/ocaml-text/default.nix b/pkgs/development/ocaml-modules/ocaml-text/default.nix index 64e0bb5ba01..d90fda954ba 100644 --- a/pkgs/development/ocaml-modules/ocaml-text/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-text/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, libiconv, ocaml, findlib, ncurses }: +{ stdenv, fetchzip, libiconv, ocaml, findlib, ocamlbuild, ncurses }: stdenv.mkDerivation rec { name = "ocaml-text-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "11jamdfn5s19a0yvl012q1xvdk1grkp4rkrn819imqrvdplqkn1y"; }; - buildInputs = [ocaml findlib ncurses libiconv]; + buildInputs = [ ocaml findlib ocamlbuild ncurses libiconv ]; configurePhase = "iconv_prefix=${libiconv} ocaml setup.ml -configure"; diff --git a/pkgs/development/ocaml-modules/ocplib-endian/default.nix b/pkgs/development/ocaml-modules/ocplib-endian/default.nix index 351f667a8c9..b7d897b3853 100644 --- a/pkgs/development/ocaml-modules/ocplib-endian/default.nix +++ b/pkgs/development/ocaml-modules/ocplib-endian/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, cppo }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, cppo }: let version = "0.8"; in @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "12xjvzw245mj4s02dgi4k2sx5gam7wxi4mbxmz6k18zg64n48yjd"; }; - buildInputs = [ ocaml findlib cppo ]; + buildInputs = [ ocaml findlib ocamlbuild cppo ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/odn/default.nix b/pkgs/development/ocaml-modules/odn/default.nix index b3c7ddb8433..f30fea2c419 100644 --- a/pkgs/development/ocaml-modules/odn/default.nix +++ b/pkgs/development/ocaml-modules/odn/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, type_conv, ounit, camlp4}: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, type_conv, ounit, camlp4 }: stdenv.mkDerivation { name = "ocaml-data-notation-0.0.11"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "09a8zdyifpc2nl4hdvg9206142y31cq95ajgij011s1qcg3z93lj"; }; - buildInputs = [ocaml findlib type_conv ounit camlp4]; + buildInputs = [ ocaml findlib ocamlbuild type_conv ounit camlp4 ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/optcomp/default.nix b/pkgs/development/ocaml-modules/optcomp/default.nix index 12075145415..7afbf3a4b40 100644 --- a/pkgs/development/ocaml-modules/optcomp/default.nix +++ b/pkgs/development/ocaml-modules/optcomp/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, camlp4}: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, camlp4 }: stdenv.mkDerivation { name = "ocaml-optcomp-1.6"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; - buildInputs = [ocaml findlib camlp4]; + buildInputs = [ ocaml findlib ocamlbuild camlp4 ]; meta = { diff --git a/pkgs/development/ocaml-modules/otfm/default.nix b/pkgs/development/ocaml-modules/otfm/default.nix index a2047a0fe78..30946da1c0b 100644 --- a/pkgs/development/ocaml-modules/otfm/default.nix +++ b/pkgs/development/ocaml-modules/otfm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, opam, uutf }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, uutf }: let inherit (stdenv.lib) getVersion versionAtLeast; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "1wgi9plf98gd7x3b7fzjxds089sivsap97bl1bw2lj73nxwnyb9c"; }; - buildInputs = [ ocaml findlib opam ]; + buildInputs = [ ocaml findlib ocamlbuild opam ]; propagatedBuildInputs = [ uutf ]; diff --git a/pkgs/development/ocaml-modules/ounit/default.nix b/pkgs/development/ocaml-modules/ounit/default.nix index 47f15f8c122..7179b8408a0 100644 --- a/pkgs/development/ocaml-modules/ounit/default.nix +++ b/pkgs/development/ocaml-modules/ounit/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, camlp4}: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, camlp4 }: stdenv.mkDerivation { name = "ounit-2.0.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "118xsadrx84pif9vaq13hv4yh22w9kmr0ypvhrs0viir1jr0ajjd"; }; - buildInputs = [ocaml findlib camlp4]; + buildInputs = [ ocaml findlib ocamlbuild camlp4 ]; dontAddPrefix = true; diff --git a/pkgs/development/ocaml-modules/pgocaml/default.nix b/pkgs/development/ocaml-modules/pgocaml/default.nix index f1bc4849a7f..6b9ae97ad54 100644 --- a/pkgs/development/ocaml-modules/pgocaml/default.nix +++ b/pkgs/development/ocaml-modules/pgocaml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, camlp4, calendar, csv, ocaml_pcre }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, camlp4, calendar, csv, ocaml_pcre }: stdenv.mkDerivation { name = "ocaml-pgocaml-2.2"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "0x0dhlz2rqxpwfdqi384f9fn0ng2irifadmxfm2b4gcz7y1cl9rh"; }; - buildInputs = [ ocaml findlib camlp4 ]; + buildInputs = [ ocaml findlib ocamlbuild camlp4 ]; propagatedBuildInputs = [ calendar csv ocaml_pcre ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/pprint/default.nix b/pkgs/development/ocaml-modules/pprint/default.nix index e28f85b475c..83732eb1f75 100644 --- a/pkgs/development/ocaml-modules/pprint/default.nix +++ b/pkgs/development/ocaml-modules/pprint/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib}: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild }: assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0sc9q89dnyarcg24czyhr6ams0ylqvia3745s6rfwd2nldpygsdk"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/qcheck/default.nix b/pkgs/development/ocaml-modules/qcheck/default.nix index 7d904e57633..158c69ef11a 100644 --- a/pkgs/development/ocaml-modules/qcheck/default.nix +++ b/pkgs/development/ocaml-modules/qcheck/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, oasis, ounit }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, oasis, ounit }: assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "0j2jdrfz8rrslgjihnfgg8yy12860z2vvf7hqzjbmfmf03hz4pgv"; }; - buildInputs = [ ocaml findlib oasis ounit ]; + buildInputs = [ ocaml findlib ocamlbuild oasis ounit ]; configureFlags = "--enable-tests --enable-ounit"; diff --git a/pkgs/development/ocaml-modules/qtest/default.nix b/pkgs/development/ocaml-modules/qtest/default.nix index 05b9c06af0f..6d5f8ecc683 100644 --- a/pkgs/development/ocaml-modules/qtest/default.nix +++ b/pkgs/development/ocaml-modules/qtest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, ounit }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, ounit }: let version = "2.2"; in @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1k68z8kby1f9s5j9xbn9bz8yhk59aalffz8gj5d1y5zhyalifrlz"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; propagatedBuildInputs = [ ounit ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/re/default.nix b/pkgs/development/ocaml-modules/re/default.nix index 072754fc60f..1ea2310bf9f 100644 --- a/pkgs/development/ocaml-modules/re/default.nix +++ b/pkgs/development/ocaml-modules/re/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, ounit }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, ounit }: stdenv.mkDerivation rec { name = "ocaml-re-1.5.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "17avk7kwmgdjkri1sj5q4a59ykc9rj0bxj6ixxpl6i0n49br3f92"; }; - buildInputs = [ ocaml findlib ounit ]; + buildInputs = [ ocaml findlib ocamlbuild ounit ]; configurePhase = "ocaml setup.ml -configure --prefix $out --enable-tests"; buildPhase = "ocaml setup.ml -build"; diff --git a/pkgs/development/ocaml-modules/react/default.nix b/pkgs/development/ocaml-modules/react/default.nix index f9fe95b89dc..66c2533853e 100644 --- a/pkgs/development/ocaml-modules/react/default.nix +++ b/pkgs/development/ocaml-modules/react/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, opam}: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }: stdenv.mkDerivation { name = "ocaml-react-1.2.0"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; unpackCmd = "tar xjf $src"; - buildInputs = [ocaml findlib opam]; + buildInputs = [ ocaml findlib ocamlbuild opam ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/reactivedata/default.nix b/pkgs/development/ocaml-modules/reactivedata/default.nix index 4b335496500..cd64e6578c1 100644 --- a/pkgs/development/ocaml-modules/reactivedata/default.nix +++ b/pkgs/development/ocaml-modules/reactivedata/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, ocaml_react, camlp4, opam}: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ocaml_react, camlp4, opam }: let ocamlVersion = stdenv.lib.getVersion ocaml; @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "0rskcxnyjn8sxqnncdm6rh9wm99nha5m5sc83fywgzs64xfl43fq"; }; - buildInputs = [ocaml findlib opam camlp4 ]; + buildInputs = [ ocaml findlib ocamlbuild opam camlp4 ]; propagatedBuildInputs = [ocaml_react]; buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true"; diff --git a/pkgs/development/ocaml-modules/safepass/default.nix b/pkgs/development/ocaml-modules/safepass/default.nix index 2f941b923e3..44a74b3fa2f 100644 --- a/pkgs/development/ocaml-modules/safepass/default.nix +++ b/pkgs/development/ocaml-modules/safepass/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild }: stdenv.mkDerivation { name = "ocaml-safepass-1.3"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "0lb8xbpyc5d1zml7s7mmcr6y2ipwdp7qz73lkv9asy7dyi6cj15g"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/sequence/default.nix b/pkgs/development/ocaml-modules/sequence/default.nix index c689aec1904..a87a13fd396 100644 --- a/pkgs/development/ocaml-modules/sequence/default.nix +++ b/pkgs/development/ocaml-modules/sequence/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, qtest, ounit }: +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, ounit }: let version = "0.6"; in @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "0mky5qas3br2x4y14dzcky212z624ydqnx8mw8w00x0c1xjpafkb"; }; - buildInputs = [ ocaml findlib qtest ounit ]; + buildInputs = [ ocaml findlib ocamlbuild qtest ounit ]; configureFlags = [ "--enable-tests" diff --git a/pkgs/development/ocaml-modules/sqlite3/default.nix b/pkgs/development/ocaml-modules/sqlite3/default.nix index 804e33fc738..cfa90226678 100644 --- a/pkgs/development/ocaml-modules/sqlite3/default.nix +++ b/pkgs/development/ocaml-modules/sqlite3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, sqlite, ocaml, findlib, pkgconfig }: +{ stdenv, fetchurl, sqlite, ocaml, findlib, ocamlbuild, pkgconfig }: stdenv.mkDerivation rec { name = "ocaml-sqlite3-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0rwsx1nfa3xqmbygim2qx45jqm1gwf08m70wmcwkx50f1qk3l551"; }; - buildInputs = [ ocaml findlib pkgconfig sqlite ]; + buildInputs = [ ocaml findlib ocamlbuild pkgconfig sqlite ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/sqlite3EZ/default.nix b/pkgs/development/ocaml-modules/sqlite3EZ/default.nix index a6ff9f44116..0a5c04ce7aa 100644 --- a/pkgs/development/ocaml-modules/sqlite3EZ/default.nix +++ b/pkgs/development/ocaml-modules/sqlite3EZ/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, twt, ocaml_sqlite3 }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, twt, ocaml_sqlite3 }: assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "8ed2c5d5914a65cbd95589ef11bfb8b38a020eb850cdd49b8adce7ee3a563748"; }; - buildInputs = [ ocaml findlib twt ]; + buildInputs = [ ocaml findlib ocamlbuild twt ]; propagatedBuildInputs = [ ocaml_sqlite3 ]; diff --git a/pkgs/development/ocaml-modules/stringext/default.nix b/pkgs/development/ocaml-modules/stringext/default.nix index 05aa2c2da68..9eb9ad514f7 100644 --- a/pkgs/development/ocaml-modules/stringext/default.nix +++ b/pkgs/development/ocaml-modules/stringext/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, ounit, qcheck +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, ounit, qcheck # Optionally enable tests; test script use OCaml-4.01+ features , doCheck ? stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01" }: @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "1jp0x9rkss8a48z9wbnc4v5zvmnysin30345psl3xnxb2aqzwlii"; }; - buildInputs = [ ocaml findlib ounit qcheck ]; + buildInputs = [ ocaml findlib ocamlbuild ounit qcheck ]; configurePhase = "ocaml setup.ml -configure --prefix $out" + stdenv.lib.optionalString doCheck " --enable-tests"; diff --git a/pkgs/development/ocaml-modules/topkg/default.nix b/pkgs/development/ocaml-modules/topkg/default.nix index 4fd6589cfb5..1b1a127c536 100644 --- a/pkgs/development/ocaml-modules/topkg/default.nix +++ b/pkgs/development/ocaml-modules/topkg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, result, opam }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, result, opam }: let ocaml-version = stdenv.lib.getVersion ocaml; in @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ opam ]; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; propagatedBuildInputs = [ result ]; unpackCmd = "tar xjf ${src}"; diff --git a/pkgs/development/ocaml-modules/tsdl/default.nix b/pkgs/development/ocaml-modules/tsdl/default.nix index 79a696632e1..d47d5d3169b 100644 --- a/pkgs/development/ocaml-modules/tsdl/default.nix +++ b/pkgs/development/ocaml-modules/tsdl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ctypes, result, SDL2, pkgconfig, opam }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ctypes, result, SDL2, pkgconfig, opam }: let inherit (stdenv.lib) getVersion; @@ -17,7 +17,7 @@ stdenv.mkDerivation { sha256 = "02x0wsy5nxagxrh07yb2h4yqqy1bxryp2gwrylds0j6ybqsv4shm"; }; - buildInputs = [ ocaml findlib result pkgconfig opam ]; + buildInputs = [ ocaml findlib ocamlbuild result pkgconfig opam ]; propagatedBuildInputs = [ SDL2 ctypes ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/ulex/default.nix b/pkgs/development/ocaml-modules/ulex/default.nix index a5b9349cbe0..fa26b305da2 100644 --- a/pkgs/development/ocaml-modules/ulex/default.nix +++ b/pkgs/development/ocaml-modules/ulex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, camlp4 }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, camlp4 }: let pname = "ulex"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; propagatedBuildInputs = [ camlp4 ]; buildFlags = "all all.opt"; diff --git a/pkgs/development/ocaml-modules/uucd/default.nix b/pkgs/development/ocaml-modules/uucd/default.nix index 7d4e4b42efb..73a0ccdacfe 100644 --- a/pkgs/development/ocaml-modules/uucd/default.nix +++ b/pkgs/development/ocaml-modules/uucd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, opam, xmlm, topkg }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, xmlm, topkg }: let pname = "uucd"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "11cjfwa4wjhsyvzq4wl9z44xi28n49drz8nbfpx754vyfzwj3yc6"; }; - buildInputs = [ ocaml findlib opam topkg ]; + buildInputs = [ ocaml findlib ocamlbuild opam topkg ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/uucp/default.nix b/pkgs/development/ocaml-modules/uucp/default.nix index 4e4dd67e210..456fc8a1976 100644 --- a/pkgs/development/ocaml-modules/uucp/default.nix +++ b/pkgs/development/ocaml-modules/uucp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, opam }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }: let inherit (stdenv.lib) getVersion versionAtLeast; @@ -19,7 +19,7 @@ stdenv.mkDerivation { sha256 = "1vm5f2ppdrnk19j0ppjiqz56qf5bzyk26gs0lz071s7iblk459jz"; }; - buildInputs = [ ocaml findlib opam ]; + buildInputs = [ ocaml findlib ocamlbuild opam ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/uuidm/default.nix b/pkgs/development/ocaml-modules/uuidm/default.nix index 07ba10a74a9..0391cd5033f 100644 --- a/pkgs/development/ocaml-modules/uuidm/default.nix +++ b/pkgs/development/ocaml-modules/uuidm/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib}: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild }: stdenv.mkDerivation rec { version = "0.9.5"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { unpackCmd = "tar -xf $curSrc"; - buildInputs = [ocaml findlib]; + buildInputs = [ ocaml findlib ocamlbuild ]; configurePhase = "ocaml setup.ml -configure --prefix $prefix"; buildPhase = "ocaml setup.ml -build"; diff --git a/pkgs/development/ocaml-modules/uunf/default.nix b/pkgs/development/ocaml-modules/uunf/default.nix index a407410907e..11ff9a36a41 100644 --- a/pkgs/development/ocaml-modules/uunf/default.nix +++ b/pkgs/development/ocaml-modules/uunf/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, opam}: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }: let pname = "uunf"; webpage = "http://erratique.ch/software/${pname}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "16cgjy1m0m61srv1pmlc3gr0y40kd4724clvpagdnz68raz4zmn0"; }; - buildInputs = [ ocaml findlib opam ]; + buildInputs = [ ocaml findlib ocamlbuild opam ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/uuseg/default.nix b/pkgs/development/ocaml-modules/uuseg/default.nix index 5946fd2a70d..3c7a4ff5c58 100644 --- a/pkgs/development/ocaml-modules/uuseg/default.nix +++ b/pkgs/development/ocaml-modules/uuseg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, opam, uucp, uutf, cmdliner }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, uucp, uutf, cmdliner }: let inherit (stdenv.lib) getVersion versionAtLeast; @@ -19,7 +19,7 @@ stdenv.mkDerivation { sha256 = "00n4zi8dyw2yzi4nr2agcrr33b0q4dr9mgnkczipf4c0gm5cm50h"; }; - buildInputs = [ ocaml findlib opam cmdliner ]; + buildInputs = [ ocaml findlib ocamlbuild opam cmdliner ]; propagatedBuildInputs = [ uucp uutf ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/uutf/default.nix b/pkgs/development/ocaml-modules/uutf/default.nix index 897630ccac6..fda630114ed 100644 --- a/pkgs/development/ocaml-modules/uutf/default.nix +++ b/pkgs/development/ocaml-modules/uutf/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, opam}: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }: let pname = "uutf"; webpage = "http://erratique.ch/software/${pname}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "0xvq20knmq25902ijpbk91ax92bkymsqkbfklj1537hpn64lydhz"; }; - buildInputs = [ ocaml findlib opam ]; + buildInputs = [ ocaml findlib ocamlbuild opam ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/xmlm/default.nix b/pkgs/development/ocaml-modules/xmlm/default.nix index 2f2d5b0b8be..d94a3eac873 100644 --- a/pkgs/development/ocaml-modules/xmlm/default.nix +++ b/pkgs/development/ocaml-modules/xmlm/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, opam}: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }: let pname = "xmlm"; webpage = "http://erratique.ch/software/${pname}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1jywcrwn5z3gkgvicr004cxmdaqfmq8wh72f81jqz56iyn5024nh"; }; - buildInputs = [ ocaml findlib opam ]; + buildInputs = [ ocaml findlib ocamlbuild opam ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/zed/default.nix b/pkgs/development/ocaml-modules/zed/default.nix index f9bf65cf814..410d5c0c612 100644 --- a/pkgs/development/ocaml-modules/zed/default.nix +++ b/pkgs/development/ocaml-modules/zed/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, camomile, ocaml_react }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, camomile, ocaml_react }: stdenv.mkDerivation rec { version = "1.4"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0d8qfy0qiydrrqi8qc9rcwgjigql6vx9gl4zp62jfz1lmjgb2a3w"; }; - buildInputs = [ ocaml findlib ocaml_react ]; + buildInputs = [ ocaml findlib ocamlbuild ocaml_react ]; propagatedBuildInputs = [ camomile ]; diff --git a/pkgs/development/tools/ocaml/cppo/default.nix b/pkgs/development/tools/ocaml/cppo/default.nix index 38b97c006cd..59130bec50e 100644 --- a/pkgs/development/tools/ocaml/cppo/default.nix +++ b/pkgs/development/tools/ocaml/cppo/default.nix @@ -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; diff --git a/pkgs/development/tools/ocaml/oasis/0.4.6.nix b/pkgs/development/tools/ocaml/oasis/0.4.6.nix index 6dcf0522232..b5e977d623b 100644 --- a/pkgs/development/tools/ocaml/oasis/0.4.6.nix +++ b/pkgs/development/tools/ocaml/oasis/0.4.6.nix @@ -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 ]; diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix index eb6cd35b256..214a2239688 100644 --- a/pkgs/development/tools/ocaml/oasis/default.nix +++ b/pkgs/development/tools/ocaml/oasis/default.nix @@ -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 ]; diff --git a/pkgs/development/tools/ocaml/ocamlify/default.nix b/pkgs/development/tools/ocaml/ocamlify/default.nix index f3caa42b8fd..d5dd0c19d98 100644 --- a/pkgs/development/tools/ocaml/ocamlify/default.nix +++ b/pkgs/development/tools/ocaml/ocamlify/default.nix @@ -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"; diff --git a/pkgs/development/tools/ocaml/ocamlmod/default.nix b/pkgs/development/tools/ocaml/ocamlmod/default.nix index 19ac4701252..0b92a45153c 100644 --- a/pkgs/development/tools/ocaml/ocamlmod/default.nix +++ b/pkgs/development/tools/ocaml/ocamlmod/default.nix @@ -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"; |