From 4c5f083d7016c737d321bbe8ac65adf73cc125ee Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Sat, 18 Feb 2017 18:10:00 +0100
Subject: [PATCH] prooftree: move out of ocamlPackages

---
 pkgs/top-level/all-packages.nix   | 5 ++++-
 pkgs/top-level/ocaml-packages.nix | 6 ------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 22b63a492ee..7e29ff17185 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17254,7 +17254,10 @@ with pkgs;
 
   picosat = callPackage ../applications/science/logic/picosat {};
 
-  inherit (ocaml-ng.ocamlPackages_4_01_0) prooftree;
+  prooftree = (with ocamlPackages_4_01_0;
+    callPackage  ../applications/science/logic/prooftree {
+      camlp5 = camlp5_transitional;
+    });
 
   prover9 = callPackage ../applications/science/logic/prover9 { };
 
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 5f000099e14..e580ac41660 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -721,12 +721,6 @@ let
       camlp5 = camlp5_transitional;
     };
 
-    prooftree =
-      if lib.versionOlder "4.01" ocaml.version
-      then null
-      else callPackage ../applications/science/logic/prooftree {
-      camlp5 = camlp5_transitional;
-    };
   };
     in lib.fix' (lib.extends overrides packageSet);
 in rec