diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-07-13 22:46:03 +0200 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-07-14 07:57:13 +0200 |
| commit | 53a50dfa7a6c634fb33382bb254e9ab40429b40b (patch) | |
| tree | a1ae5f22388bf317600a9a5bdef26d2188db0960 /pkgs/development/ocaml-modules/camomile | |
| parent | c5798c1db29a9e8aaffb49128452d6fb37462d39 (diff) | |
ocamlPackages.camomile: fix build for OCaml 4.05
Diffstat (limited to 'pkgs/development/ocaml-modules/camomile')
| -rw-r--r-- | pkgs/development/ocaml-modules/camomile/0.8.2.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/camomile/default.nix | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/development/ocaml-modules/camomile/0.8.2.nix b/pkgs/development/ocaml-modules/camomile/0.8.2.nix index 63daf21e40805..a7e591e049e61 100644 --- a/pkgs/development/ocaml-modules/camomile/0.8.2.nix +++ b/pkgs/development/ocaml-modules/camomile/0.8.2.nix @@ -1,5 +1,9 @@ {stdenv, fetchurl, ocaml, findlib, camlp4}: +if stdenv.lib.versionAtLeast ocaml.version "4.05" +then throw "camomile-0.8.2 is not available for OCaml ${ocaml.version}" +else + stdenv.mkDerivation rec { name = "camomile-${version}"; version = "0.8.2"; diff --git a/pkgs/development/ocaml-modules/camomile/default.nix b/pkgs/development/ocaml-modules/camomile/default.nix index 950d7f7fc8f23..48517036dc6d5 100644 --- a/pkgs/development/ocaml-modules/camomile/default.nix +++ b/pkgs/development/ocaml-modules/camomile/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, camlp4}: +{stdenv, fetchurl, fetchpatch, ocaml, findlib, camlp4}: stdenv.mkDerivation rec { name = "camomile-${version}"; @@ -9,6 +9,11 @@ stdenv.mkDerivation rec { sha256 = "003ikpvpaliy5hblhckfmln34zqz0mk3y2m1fqvbjngh3h2np045"; }; + patches = [ (fetchpatch { + url = https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/camomile/camomile.0.8.5/files/4.05-typing-fix.patch; + sha256 = "167279lia6qx62mdcyc5rjsi4gf4yi52wn9mhgd9y1v3754z7fwb"; + })]; + buildInputs = [ocaml findlib camlp4]; createFindlibDestdir = true; |