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 | |
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”.
-rw-r--r-- | pkgs/development/tools/ocaml/ocaml-top/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/tools/ocaml/ocp-build/default.nix | 9 | ||||
-rw-r--r-- | pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix | 6 | ||||
-rw-r--r-- | pkgs/development/tools/ocaml/ocp-indent/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/tools/ocaml/ocp-index/default.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 2 |
6 files changed, 15 insertions, 16 deletions
diff --git a/pkgs/development/tools/ocaml/ocaml-top/default.nix b/pkgs/development/tools/ocaml/ocaml-top/default.nix index 3cf70d66ddbd..e7d8b163420c 100644 --- a/pkgs/development/tools/ocaml/ocaml-top/default.nix +++ b/pkgs/development/tools/ocaml/ocaml-top/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; buildInputs = [ ncurses jbuilder ] - ++ (with ocamlPackages; [ ocaml ocpBuild findlib lablgtk ocp-index ]); + ++ (with ocamlPackages; [ ocaml ocp-build findlib lablgtk ocp-index ]); configurePhase = '' export TERM=xterm diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix index 8da0f781a8b2..0ed7312660a1 100644 --- a/pkgs/development/tools/ocaml/ocp-build/default.nix +++ b/pkgs/development/tools/ocaml/ocp-build/default.nix @@ -1,11 +1,10 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ncurses, buildOcaml }: +{ stdenv, fetchFromGitHub, ocaml, findlib, ncurses }: let version = "1.99.19-beta"; in -buildOcaml { +stdenv.mkDerivation rec { - name = "ocp-build"; - inherit version; + name = "ocaml${ocaml.version}-ocp-build-${version}"; src = fetchFromGitHub { owner = "OCamlPro"; @@ -14,7 +13,7 @@ buildOcaml { sha256 = "162k5l0cxyqanxlml5v8mqapdq5qbqc9m4b8wdjq7mf523b3h2zj"; }; - buildInputs = [ ocaml ]; + buildInputs = [ ocaml findlib ]; propagatedBuildInputs = [ ncurses ]; preInstall = "mkdir -p $out/bin"; preConfigure = '' diff --git a/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix b/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix index 3951be18de3a..693ad70402f6 100644 --- a/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix +++ b/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchzip, ocaml, findlib, ocpBuild, cmdliner }: +{ stdenv, fetchzip, ocaml, findlib, ocp-build, cmdliner }: let inherit (stdenv.lib) getVersion versionAtLeast; in assert versionAtLeast (getVersion ocaml) "3.12.1"; -assert versionAtLeast (getVersion ocpBuild) "1.99.6-beta"; +assert versionAtLeast (getVersion ocp-build) "1.99.6-beta"; assert versionAtLeast "0.9.8" (getVersion cmdliner); stdenv.mkDerivation { @@ -15,7 +15,7 @@ stdenv.mkDerivation { sha256 = "0ynv2yhm7akpvqp72pdabhddwr352s1k85q8m1khsvspgg1mkiqz"; }; - nativeBuildInputs = [ ocpBuild ]; + nativeBuildInputs = [ ocp-build ]; buildInputs = [ ocaml findlib cmdliner ]; diff --git a/pkgs/development/tools/ocaml/ocp-indent/default.nix b/pkgs/development/tools/ocaml/ocp-indent/default.nix index f30c0f278f78..43898d250d91 100644 --- a/pkgs/development/tools/ocaml/ocp-indent/default.nix +++ b/pkgs/development/tools/ocaml/ocp-indent/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchzip, ocaml, findlib, jbuilder, ocpBuild, cmdliner }: +{ stdenv, fetchzip, ocaml, findlib, jbuilder, ocp-build, cmdliner }: let inherit (stdenv.lib) getVersion versionAtLeast; in assert versionAtLeast (getVersion ocaml) "3.12.1"; assert versionAtLeast (getVersion cmdliner) "1.0.0"; -assert versionAtLeast (getVersion ocpBuild) "1.99.6-beta"; +assert versionAtLeast (getVersion ocp-build) "1.99.6-beta"; stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "0rcaa11mjqka032g94wgw9llqpflyk3ywr3lr6jyxbh1rjvnipnw"; }; - nativeBuildInputs = [ ocpBuild ]; + nativeBuildInputs = [ ocp-build ]; buildInputs = [ ocaml findlib cmdliner ]; inherit (jbuilder) installPhase; 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 ]; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 6ca593f349fb..3f334d1ed17d 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -494,7 +494,7 @@ let ocf = callPackage ../development/ocaml-modules/ocf { }; - ocpBuild = callPackage ../development/tools/ocaml/ocp-build { }; + ocp-build = callPackage ../development/tools/ocaml/ocp-build { }; ocpIndent = callPackage ../development/tools/ocaml/ocp-indent { }; ocpIndent_1_5_2 = callPackage ../development/tools/ocaml/ocp-indent/1.5.2.nix { cmdliner = cmdliner_0_9; }; |