diff options
author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2018-06-26 05:19:44 +0000 |
---|---|---|
committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2018-06-26 20:14:57 +0000 |
commit | fd018bdaddf87c3bcccdf84f9698447695aed35d (patch) | |
tree | ef9152494f760e71fee7873e79403d4aa693dde0 /pkgs/development/tools/ocaml/ocp-index/default.nix | |
parent | 06db050abd9985cbac0f2a96ffa91a5789482af7 (diff) | |
download | nixlib-fd018bdaddf87c3bcccdf84f9698447695aed35d.tar nixlib-fd018bdaddf87c3bcccdf84f9698447695aed35d.tar.gz nixlib-fd018bdaddf87c3bcccdf84f9698447695aed35d.tar.bz2 nixlib-fd018bdaddf87c3bcccdf84f9698447695aed35d.tar.lz nixlib-fd018bdaddf87c3bcccdf84f9698447695aed35d.tar.xz nixlib-fd018bdaddf87c3bcccdf84f9698447695aed35d.tar.zst nixlib-fd018bdaddf87c3bcccdf84f9698447695aed35d.zip |
ocamlPackages.ocp-build: remove spurious dependency to camlp4
Change attribute name from “ocpBuild” to “ocp-build”.
Diffstat (limited to 'pkgs/development/tools/ocaml/ocp-index/default.nix')
-rw-r--r-- | pkgs/development/tools/ocaml/ocp-index/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/tools/ocaml/ocp-index/default.nix b/pkgs/development/tools/ocaml/ocp-index/default.nix index 6b865e9709a6..669d9789427f 100644 --- a/pkgs/development/tools/ocaml/ocp-index/default.nix +++ b/pkgs/development/tools/ocaml/ocp-index/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, ocpBuild, ocpIndent, opam, cmdliner, ncurses, re, lambdaTerm, libev }: +{ stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, ocp-build, ocpIndent, opam, cmdliner, ncurses, re, lambdaTerm, libev }: let inherit (stdenv.lib) getVersion versionAtLeast optional; in assert versionAtLeast (getVersion ocaml) "4"; -assert versionAtLeast (getVersion ocpBuild) "1.99.13-beta"; +assert versionAtLeast (getVersion ocp-build) "1.99.13-beta"; assert versionAtLeast (getVersion ocpIndent) "1.4.2"; let @@ -26,7 +26,7 @@ stdenv.mkDerivation { sha256 = "07snnydczkzapradh1c22ggv9vaff67nc36pi3218azb87mb1p7z"; }) ]; - buildInputs = [ ocaml findlib ocpBuild opam cmdliner ncurses re libev ] + buildInputs = [ ocaml findlib ocp-build opam cmdliner ncurses re libev ] ++ optional (versionAtLeast (getVersion lambdaTerm) "1.7") lambdaTerm; propagatedBuildInputs = [ ocpIndent ]; |