From f9b4c1c04ae88a3508301790987d6348a006d50a Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 1 Nov 2016 10:16:45 +0100
Subject: [PATCH] opam: move out of ocamlPackages

---
 pkgs/top-level/all-packages.nix   | 2 +-
 pkgs/top-level/ocaml-packages.nix | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dc3552787c7..d5e13f3789b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5111,7 +5111,7 @@ in
     nodejs = nodejs-4_x;
   };
 
-  inherit (ocamlPackages) opam;
+  opam = callPackage ../development/tools/ocaml/opam { };
 
   picat = callPackage ../development/compilers/picat {
     stdenv = overrideCC stdenv gcc49;
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index c88b2135525..a2a1add4f6d 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -625,8 +625,6 @@ let
 
     ocaml-top = callPackage ../development/tools/ocaml/ocaml-top { };
 
-    opam = callPackage ../development/tools/ocaml/opam { };
-
     ocamlnat = callPackage  ../development/ocaml-modules/ocamlnat { };
 
     trv = callPackage ../development/tools/misc/trv { };