From 58fb33a08d5ac70138ab93d676392e135b03ac2e Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 1 Jun 2016 17:04:14 +0200
Subject: [PATCH 1/2] ocamlPackages.estring: init at 1.3

---
 .../ocaml-modules/estring/default.nix           | 17 +++++++++++++++++
 pkgs/top-level/all-packages.nix                 |  2 ++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/estring/default.nix

diff --git a/pkgs/development/ocaml-modules/estring/default.nix b/pkgs/development/ocaml-modules/estring/default.nix
new file mode 100644
index 000000000000..8bfab87fc397
--- /dev/null
+++ b/pkgs/development/ocaml-modules/estring/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, buildOcaml, fetchurl }:
+
+buildOcaml rec {
+  name = "estring";
+  version = "1.3";
+
+  src = fetchurl {
+    url = "https://forge.ocamlcore.org/frs/download.php/1012/estring-${version}.tar.gz";
+    sha256 = "0b6znz5igm8pp28w4b7sgy82rpd9m5aw6ss933rfbw1mrh05gvcg";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = "http://estring.forge.ocamlcore.org/";
+    description = "Extension for string literals";
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 65fced534a85..2b3f8176ad94 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4916,6 +4916,8 @@ in
 
     erm_xmpp = callPackage ../development/ocaml-modules/erm_xmpp { };
 
+    estring = callPackage ../development/ocaml-modules/estring { };
+
     ezjsonm = callPackage ../development/ocaml-modules/ezjsonm {
       lwt = ocaml_lwt;
     };

From d1be5453313b3d6e132f59ce973b6cdaf2a46053 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 1 Jun 2016 17:04:55 +0200
Subject: [PATCH 2/2] ocamlPackages.sqlexpr: init at 0.5.5

---
 .../ocaml-modules/sqlexpr/default.nix         | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/sqlexpr/default.nix

diff --git a/pkgs/development/ocaml-modules/sqlexpr/default.nix b/pkgs/development/ocaml-modules/sqlexpr/default.nix
new file mode 100644
index 000000000000..f5f32e9bc030
--- /dev/null
+++ b/pkgs/development/ocaml-modules/sqlexpr/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, buildOcaml, fetchurl, ocaml_batteries, csv, ocaml_lwt, ocaml_sqlite3, estring }:
+
+buildOcaml rec {
+  name = "sqlexpr";
+  version = "0.5.5";
+
+  src = fetchurl {
+    url = "https://forge.ocamlcore.org/frs/download.php/1203/ocaml-sqlexpr-${version}.tar.gz";
+    sha256 = "02pi0xxr3xzalwpvcaq96k57wz2vxj20l2mga1a4d2ddvhran8kr";
+  };
+
+  propagatedBuildInputs = [ ocaml_batteries csv ocaml_lwt ocaml_sqlite3 estring ];
+
+  meta = with stdenv.lib; {
+    homepage = "http://github.com/mfp/ocaml-sqlexpr";
+    description = "Type-safe, convenient SQLite database access";
+    license = licenses.lgpl21;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2b3f8176ad94..098f416fac74 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5097,6 +5097,8 @@ in
 
     sequence = callPackage ../development/ocaml-modules/sequence { };
 
+    sqlexpr = callPackage ../development/ocaml-modules/sqlexpr { };
+
     tuntap = callPackage ../development/ocaml-modules/tuntap { };
 
     tyxml = callPackage ../development/ocaml-modules/tyxml { };