MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 23:36:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

ocamlPackages.ocp-build: remove spurious dependency to camlp4

Browse source 
Change attribute name from “ocpBuild” to “ocp-build”.
This commit is contained in:
Vincent Laporte 2018-06-26 05:19:44 +00:00
parent 06db050abd
commit fd018bdadd
No known key found for this signature in database
GPG key ID: EBD582ADDDB1F81F
6 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/tools/ocaml/ocaml-top/default.nix
View file

@ -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

9
pkgs/development/tools/ocaml/ocp-build/default.nix
View file

@ -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 = ''

6
pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix
View file

@ -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 ];

6
pkgs/development/tools/ocaml/ocp-indent/default.nix
View file

@ -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;

6
pkgs/development/tools/ocaml/ocp-index/default.nix
View file

@ -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 ];

2
pkgs/top-level/ocaml-packages.nix
View file

@ -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; };