diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2015-07-01 20:22:55 +0200 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2015-07-01 20:23:19 +0200 |
| commit | 2663f24a4861b5cb3fd86845bc222a3d219d4130 (patch) | |
| tree | c9520638579ea32f736582ac16afebceb2dd6ec1 /pkgs/development/tools/ocaml | |
| parent | ba4ddf51efe55707eac722f5bf00c12f250864ff (diff) | |
| download | nixlib-2663f24a4861b5cb3fd86845bc222a3d219d4130.tar nixlib-2663f24a4861b5cb3fd86845bc222a3d219d4130.tar.gz nixlib-2663f24a4861b5cb3fd86845bc222a3d219d4130.tar.bz2 nixlib-2663f24a4861b5cb3fd86845bc222a3d219d4130.tar.lz nixlib-2663f24a4861b5cb3fd86845bc222a3d219d4130.tar.xz nixlib-2663f24a4861b5cb3fd86845bc222a3d219d4130.tar.zst nixlib-2663f24a4861b5cb3fd86845bc222a3d219d4130.zip | |
ocp-index: 1.1.1 -> 1.1.2
Diffstat (limited to 'pkgs/development/tools/ocaml')
| -rw-r--r-- | pkgs/development/tools/ocaml/ocp-index/default.nix | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/development/tools/ocaml/ocp-index/default.nix b/pkgs/development/tools/ocaml/ocp-index/default.nix index 767a5e17cb4a..c901d676b90e 100644 --- a/pkgs/development/tools/ocaml/ocp-index/default.nix +++ b/pkgs/development/tools/ocaml/ocp-index/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, ocpBuild, ocpIndent, opam, cmdliner, ncurses, re, lambdaTerm, libev }: +{ stdenv, fetchurl, fetchzip, ocaml, findlib, ocpBuild, ocpIndent, opam, cmdliner, ncurses, re, lambdaTerm, libev }: let inherit (stdenv.lib) getVersion versionAtLeast optional; in @@ -6,7 +6,13 @@ assert versionAtLeast (getVersion ocaml) "3.12.1"; assert versionAtLeast (getVersion ocpBuild) "1.99.6-beta"; assert versionAtLeast (getVersion ocpIndent) "1.4.2"; -let version = "1.1.1"; in +let + version = "1.1.2"; + patch402 = fetchurl { + url = https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/ocp-index/ocp-index.1.1.2/files/ocaml.4.02.patch; + sha256 = "1wcpn2pv7h8ia3ybmzdlm8v5hfvq1rgmlj02wwj0yh3vqjvxqvsm"; + }; +in stdenv.mkDerivation { @@ -14,9 +20,11 @@ stdenv.mkDerivation { src = fetchzip { url = "http://github.com/OCamlPro/ocp-index/archive/${version}.tar.gz"; - sha256 = "173lqbyivwv1zf9ifpxa9f8m2y3kybzs3idrwyzy824ixdqv2fww"; + sha256 = "0cz0bz5nisc5r23b1w07q2bl489gd09mg8rp9kyq9m6rj669b18l"; }; + patches = optional (versionAtLeast (getVersion ocaml) "4.02") patch402; + buildInputs = [ ocaml findlib ocpBuild opam cmdliner ncurses re libev ] ++ optional (versionAtLeast (getVersion lambdaTerm) "1.7") lambdaTerm; propagatedBuildInputs = [ ocpIndent ]; |