From 11e4fcf9413aff12dd4638bc098bfebeb936b2fb Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Thu, 16 Feb 2017 11:27:10 +0100 Subject: [PATCH] ocamlPackages.llpp: only allow with ocaml-4.04 --- pkgs/top-level/ocaml-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 615268e3778e..750fb7324a4b 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -695,7 +695,11 @@ let google-drive-ocamlfuse = callPackage ../applications/networking/google-drive-ocamlfuse { }; - llpp = callPackage ../applications/misc/llpp { }; + llpp = + if lib.versionOlder "4.04" ocaml.version + then callPackage ../applications/misc/llpp { } + else null; + monotoneViz = callPackage ../applications/version-management/monotone-viz { inherit (pkgs.gnome2) libgnomecanvas glib;