public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 20:14:57 +00:00
parent 06db050abd
commit fd018bdadd
6 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix
+3 -3
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 ];
pkgs/development/tools/ocaml/ocp-indent/default.nix
+3 -3
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;