From 1c2fcf411503155da7d9ae0eee66f1894f4c511f Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@afiniate.com>
Date: Fri, 15 May 2015 09:35:42 -0500
Subject: ocaml-ipaddr: add version (2.6.1) to the system

---
 pkgs/development/ocaml-modules/eliom/default.nix   |  4 +--
 pkgs/development/ocaml-modules/ipaddr/default.nix  | 32 ++++++++++++++++++++++
 .../ocaml-modules/ocaml-ipaddr/default.nix         | 23 ----------------
 .../ocaml-modules/ocsigen-server/default.nix       |  8 +++---
 pkgs/top-level/all-packages.nix                    |  4 +--
 5 files changed, 40 insertions(+), 31 deletions(-)
 create mode 100644 pkgs/development/ocaml-modules/ipaddr/default.nix
 delete mode 100644 pkgs/development/ocaml-modules/ocaml-ipaddr/default.nix

diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix
index 9700a1d8cc5e..54644d836994 100644
--- a/pkgs/development/ocaml-modules/eliom/default.nix
+++ b/pkgs/development/ocaml-modules/eliom/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, ocaml, findlib, which, ocsigen_server, ocsigen_deriving,
   js_of_ocaml, ocaml_react, ocaml_lwt, calendar, cryptokit, tyxml,
-  ocaml_ipaddr, ocamlnet, ocaml_ssl, ocaml_pcre, ocaml_optcomp,
+  ipaddr, ocamlnet, ocaml_ssl, ocaml_pcre, ocaml_optcomp,
   reactivedata, opam}:
 
 stdenv.mkDerivation rec
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec
   buildInputs = [ocaml which ocsigen_server findlib ocsigen_deriving
                  js_of_ocaml ocaml_optcomp opam];
 
-  propagatedBuildInputs = [ ocaml_lwt reactivedata tyxml ocaml_ipaddr
+  propagatedBuildInputs = [ ocaml_lwt reactivedata tyxml ipaddr
                             calendar cryptokit ocamlnet ocaml_react ocaml_ssl
                             ocaml_pcre ];
 
diff --git a/pkgs/development/ocaml-modules/ipaddr/default.nix b/pkgs/development/ocaml-modules/ipaddr/default.nix
new file mode 100644
index 000000000000..749b6a1d94e3
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ipaddr/default.nix
@@ -0,0 +1,32 @@
+{stdenv, buildOcaml, fetchurl, sexplib}:
+
+buildOcaml rec {
+  name = "ipaddr";
+  version = "2.6.1";
+
+  src = fetchurl {
+    url = "https://github.com/mirage/ocaml-ipaddr/archive/${version}.tar.gz";
+    sha256 = "7051013d8f58abff433187d70cd7ddd7a6b49a6fbe6cad1893f571f65b8ed3d0";
+  };
+
+  propagatedBuildInputs = [ sexplib ];
+
+  configurePhase = ''
+   ocaml setup.ml -configure --prefix $out
+  '';
+
+  buildPhase =  ''
+  make build
+  '';
+
+  installPhase =  ''
+  make install
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/mirage/ocaml-ipaddr;
+    description = "A library for manipulation of IP (and MAC) address representations ";
+    license = licenses.mit;
+    maintainers = [ maintainers.ericbmerritt ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/ocaml-ipaddr/default.nix b/pkgs/development/ocaml-modules/ocaml-ipaddr/default.nix
deleted file mode 100644
index 6b50f79caf99..000000000000
--- a/pkgs/development/ocaml-modules/ocaml-ipaddr/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{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 = [sexplib];
-
-  createFindlibDestdir = true;
-
-  meta = with stdenv.lib; {
-    description = "An OCaml library for manipulation of IP (and MAC) address representations";
-    license = licenses.isc;
-    maintainers = [ maintainers.vbgl ];
-    platforms = ocaml.meta.platforms;
-  };
-
-}
diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
index d5c066ae2aa0..58d8b047ec1d 100644
--- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
@@ -1,17 +1,17 @@
 {stdenv, fetchurl, ocaml, findlib, which, ocaml_react, ocaml_ssl,
-ocaml_lwt, ocamlnet, ocaml_pcre, cryptokit, tyxml, ocaml_ipaddr, zlib,
+ocaml_lwt, ocamlnet, ocaml_pcre, cryptokit, tyxml, ipaddr, zlib,
 libev, openssl, ocaml_sqlite3, tree, uutf}:
 
 stdenv.mkDerivation {
   name = "ocsigenserver-2.5";
-  
+
   src = fetchurl {
     url = https://github.com/ocsigen/ocsigenserver/archive/2.5.tar.gz;
     sha256 = "0ayzlzjwg199va4sclsldlcp0dnwdj45ahhg9ckb51m28c2pw46r";
   };
 
   buildInputs = [ocaml which findlib ocaml_react ocaml_ssl ocaml_lwt
-  ocamlnet ocaml_pcre cryptokit tyxml ocaml_ipaddr zlib libev openssl
+  ocamlnet ocaml_pcre cryptokit tyxml ipaddr zlib libev openssl
   ocaml_sqlite3 tree uutf];
 
   configureFlags = "--root $(out) --prefix /";
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
 
   createFindlibDestdir = true;
 
-  postFixup = 
+  postFixup =
   ''
   rm -rf $out/var/run
   '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3593285c1b5a..81d66fd2c0f4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4172,6 +4172,8 @@ let
 
     io-page = callPackage ../development/ocaml-modules/io-page { };
 
+    ipaddr = callPackage ../development/ocaml-modules/ipaddr { };
+
     javalib = callPackage ../development/ocaml-modules/javalib {
       extlib = ocaml_extlib_maximal;
     };
@@ -4256,8 +4258,6 @@ let
 
     ocamlify = callPackage ../development/tools/ocaml/ocamlify { };
 
-    ocaml_ipaddr = callPackage ../development/ocaml-modules/ocaml-ipaddr { };
-
     ocaml_lwt = callPackage ../development/ocaml-modules/lwt { };
 
     ocamlmod = callPackage ../development/tools/ocaml/ocamlmod { };
-- 
cgit 1.4.1