ocamlPackages.ocp-index: 1.1.5 -> 1.1.6
This commit is contained in:
parent
fd018bdadd
commit
0d1b5285c9
@ -1,39 +1,23 @@
|
||||
{ stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, ocp-build, ocpIndent, opam, cmdliner, ncurses, re, lambdaTerm, libev }:
|
||||
{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, ocp-build, ocpIndent, cmdliner, re }:
|
||||
|
||||
let inherit (stdenv.lib) getVersion versionAtLeast optional; in
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
assert versionAtLeast (getVersion ocaml) "4";
|
||||
assert versionAtLeast (getVersion ocp-build) "1.99.13-beta";
|
||||
assert versionAtLeast (getVersion ocpIndent) "1.4.2";
|
||||
|
||||
let
|
||||
version = "1.1.5";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
||||
name = "ocp-index-${version}";
|
||||
version = "1.1.6";
|
||||
name = "ocaml${ocaml.version}-ocp-index-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OCamlPro";
|
||||
repo = "ocp-index";
|
||||
rev = version;
|
||||
sha256 = "0gir0fm8mq609371kmwpsqfvpfx2b26ax3f9rg5fjf5r0bjk9pqd";
|
||||
sha256 = "0p367aphz9w71qbm3y47qwhgqmyai28l96i1ifb6kg7awph5qmj3";
|
||||
};
|
||||
|
||||
patches = [ (fetchpatch {
|
||||
url = https://github.com/OCamlPro/ocp-index/commit/618872a0980d077857a63d502eadbbf0d1b05c0f.diff;
|
||||
sha256 = "07snnydczkzapradh1c22ggv9vaff67nc36pi3218azb87mb1p7z";
|
||||
}) ];
|
||||
|
||||
buildInputs = [ ocaml findlib ocp-build opam cmdliner ncurses re libev ]
|
||||
++ optional (versionAtLeast (getVersion lambdaTerm) "1.7") lambdaTerm;
|
||||
buildInputs = [ ocaml findlib jbuilder ocp-build cmdliner re ];
|
||||
propagatedBuildInputs = [ ocpIndent ];
|
||||
|
||||
createFindlibDestdir = true;
|
||||
buildPhase = "jbuilder build -p ocp-index";
|
||||
|
||||
preBuild = "export TERM=xterm";
|
||||
postInstall = "mv $out/lib/{ocp-index,ocaml/${getVersion ocaml}/site-lib/}";
|
||||
inherit (jbuilder) installPhase;
|
||||
|
||||
meta = {
|
||||
homepage = http://typerex.ocamlpro.com/ocp-index.html;
|
||||
|
Loading…
Reference in New Issue
Block a user