From ea0d507935b4deda7faea3ac6d34a11e44f286e8 Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@afiniate.com>
Date: Sun, 24 May 2015 10:14:14 -0700
Subject: [PATCH] sexplib: rename from ocaml_sexplib to sexplib

There really isn't any need for it to be named ocaml_sexplib
---
 pkgs/development/ocaml-modules/ocaml-ipaddr/default.nix | 8 ++++----
 pkgs/top-level/all-packages.nix                         | 8 ++------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ocaml-ipaddr/default.nix b/pkgs/development/ocaml-modules/ocaml-ipaddr/default.nix
index 09cfe1c350d..6b50f79caf9 100644
--- a/pkgs/development/ocaml-modules/ocaml-ipaddr/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-ipaddr/default.nix
@@ -1,15 +1,15 @@
-{ocaml, findlib, stdenv, fetchurl, ocaml_sexplib}:
+{ocaml, findlib, stdenv, fetchurl, sexplib}:
 assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12";
 stdenv.mkDerivation {
   name = "ocaml-ipaddr-2.5.0";
-  
+
   src = fetchurl {
     url = https://github.com/mirage/ocaml-ipaddr/archive/2.5.0.tar.gz;
     sha256 = "0zpslxzjs5zdw20j3jaf6fr0w2imnidhrzggmnvwp198r76aq917";
   };
 
   buildInputs = [ocaml findlib];
-  propagatedBuildInputs = [ocaml_sexplib];
+  propagatedBuildInputs = [sexplib];
 
   createFindlibDestdir = true;
 
@@ -19,5 +19,5 @@ stdenv.mkDerivation {
     maintainers = [ maintainers.vbgl ];
     platforms = ocaml.meta.platforms;
   };
-  
+
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5abd701501b..b298c868204 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4118,7 +4118,6 @@ let
 
     cstruct = callPackage ../development/ocaml-modules/cstruct {
       lwt = ocaml_lwt;
-      sexplib = ocaml_sexplib;
     };
 
     csv = callPackage ../development/ocaml-modules/csv { };
@@ -4141,7 +4140,6 @@ let
 
     ezjsonm = callPackage ../development/ocaml-modules/ezjsonm {
       lwt = ocaml_lwt;
-      sexplib = ocaml_sexplib;
     };
 
     fieldslib = callPackage ../development/ocaml-modules/fieldslib { };
@@ -4307,7 +4305,7 @@ let
     sexplib_111_25_00 = callPackage ../development/ocaml-modules/sexplib/111.25.00.nix { };
     sexplib_112_24_01 = callPackage ../development/ocaml-modules/sexplib/112.24.01.nix { };
 
-    ocaml_sexplib =
+    sexplib =
       if lib.versionOlder "4.02" ocaml_version
       then sexplib_112_24_01
       else if lib.versionOlder "4.00" ocaml_version
@@ -4349,9 +4347,7 @@ let
     uucp = callPackage ../development/ocaml-modules/uucp { };
     uunf = callPackage ../development/ocaml-modules/uunf { };
 
-    uri = callPackage ../development/ocaml-modules/uri {
-      sexplib = ocaml_sexplib;
-    };
+    uri = callPackage ../development/ocaml-modules/uri { };
 
     uuseg = callPackage ../development/ocaml-modules/uuseg { };
     uutf = callPackage ../development/ocaml-modules/uutf { };