From b9741719fa085f58671dedb25ed6b7d25d6dedd1 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 23 Sep 2014 20:48:50 +0100 Subject: [PATCH] Fixes ocamlgraph (depends on camlp4) and prooftree (not ready for OCaml4.02) --- pkgs/development/ocaml-modules/ocamlgraph/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocamlgraph/default.nix b/pkgs/development/ocaml-modules/ocamlgraph/default.nix index 9f411dd2a6f..98747e2a193 100644 --- a/pkgs/development/ocaml-modules/ocamlgraph/default.nix +++ b/pkgs/development/ocaml-modules/ocamlgraph/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "0bxqxzd5sd7siz57vhzb8bmiz1ddhgdv49gcsmwwfmd16mj4cryi"; }; - buildInputs = [ ocaml findlib ocamlPackages.lablgtk ]; + buildInputs = [ ocaml findlib ocamlPackages.lablgtk ocamlPackages.camlp4 ]; patches = ./destdir.patch; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9b85936661e..459a33380ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11453,8 +11453,8 @@ let picosat = callPackage ../applications/science/logic/picosat {}; prooftree = callPackage ../applications/science/logic/prooftree { - inherit (ocamlPackages) findlib lablgtk; - camlp5 = ocamlPackages.camlp5_transitional; + inherit (ocamlPackages_4_01_0) ocaml findlib lablgtk; + camlp5 = ocamlPackages_4_01_0.camlp5_transitional; }; prover9 = callPackage ../applications/science/logic/prover9 { };