From c3e12acb5a0a48522de1073ab61be56381397d63 Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Wed, 12 Sep 2012 21:22:20 +0200
Subject: [PATCH] Update extlib to version 1.5.2

---
 pkgs/development/ocaml-modules/extlib/default.nix    |  9 ++++-----
 .../extlib/hashtable-ocaml4-compat.patch             | 12 ------------
 2 files changed, 4 insertions(+), 17 deletions(-)
 delete mode 100644 pkgs/development/ocaml-modules/extlib/hashtable-ocaml4-compat.patch

diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/pkgs/development/ocaml-modules/extlib/default.nix
index a520f8196d8a..d59dbae45fe9 100644
--- a/pkgs/development/ocaml-modules/extlib/default.nix
+++ b/pkgs/development/ocaml-modules/extlib/default.nix
@@ -4,11 +4,10 @@ stdenv.mkDerivation {
   name = "ocaml-extlib-1.5.2";
 
   src = fetchurl {
-    url = "http://ocaml-extlib.googlecode.com/files/extlib-1.5.2.tar.gz";
-    sha256 = "ca6d69adeba4242ce41c02a23746ba1e464c0bbec66e2d16b02c3c6e85dc10aa";
+    url = http://ocaml-extlib.googlecode.com/files/extlib-1.5.3.tar.gz;
+    sha256 = "c095eef4202a8614ff1474d4c08c50c32d6ca82d1015387785cf03d5913ec021";
   };
 
-  patches = [ ./hashtable-ocaml4-compat.patch ];
   buildInputs = [ocaml findlib];
 
   createFindlibDestdir = true;
@@ -19,9 +18,9 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = "http://code.google.com/p/ocaml-extlib/";
+    homepage = http://code.google.com/p/ocaml-extlib/;
     description = "Enhancements to the OCaml Standard Library modules";
-    license = "LGPL";
+    license = stdenv.lib.licenses.lgpl21;
     platforms = ocaml.meta.platforms;
   };
 }
diff --git a/pkgs/development/ocaml-modules/extlib/hashtable-ocaml4-compat.patch b/pkgs/development/ocaml-modules/extlib/hashtable-ocaml4-compat.patch
deleted file mode 100644
index c587f2b6cd3b..000000000000
--- a/pkgs/development/ocaml-modules/extlib/hashtable-ocaml4-compat.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Revision 396 from the official extlib repository.
-
---- extlib/extHashtbl.ml	(revision 395)
-+++ extlib/extHashtbl.ml	(working copy)
-@@ -32,6 +32,7 @@
- 	}
- 
- 	include Hashtbl
-+	let create n = Hashtbl.create (* no seed *) n
- 
- 	external h_conv : ('a, 'b) t -> ('a, 'b) h_t = "%identity"
- 	external h_make : ('a, 'b) h_t -> ('a, 'b) t = "%identity"
\ No newline at end of file