From c0691a0659a06a0edfaa529568982d34b88e7eb9 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 24 Jan 2016 22:54:53 +0100
Subject: [PATCH] compcert: 2.5 -> 2.6

---
 pkgs/development/compilers/compcert/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix                 | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix
index 3b1ebca17965..190f2b7a96af 100644
--- a/pkgs/development/compilers/compcert/default.nix
+++ b/pkgs/development/compilers/compcert/default.nix
@@ -4,14 +4,14 @@
 
 stdenv.mkDerivation rec {
   name    = "compcert-${version}";
-  version = "2.5";
+  version = "2.6";
 
   src = fetchurl {
     url    = "http://compcert.inria.fr/release/${name}.tgz";
-    sha256 = "15gxarl2a8mz33fdn8pycj0ccazgmllbg2940n7aqdjlz807p11n";
+    sha256 = "05sdxgg2w7ykw6xbcq6dl2kzxdz4qzhjajiawpy6490wqiji7wm1";
   };
 
-  buildInputs = [ coq ] ++ (with ocamlPackages; [ ocaml menhir ]);
+  buildInputs = [ coq ] ++ (with ocamlPackages; [ ocaml findlib menhir ]);
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 905b4c18e8a4..a9d1569b24e8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3883,11 +3883,13 @@ let
 
   cmucl_binary = callPackage_i686 ../development/compilers/cmucl/binary.nix { };
 
-  compcert = callPackage ../development/compilers/compcert (
+  compcert = callPackage ../development/compilers/compcert ((
     if system == "x86_64-linux"
     then { tools = pkgsi686Linux.stdenv.cc; }
     else {}
-  );
+  ) // {
+    ocamlPackages = ocamlPackages_4_02;
+  });
 
   cryptol = haskellPackages.cryptol;