public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ocaml-ipaddr: add version (2.6.1) to the system

Browse Source
This commit is contained in:
Eric Merritt 2015-05-15 09:35:42 -05:00
parent ea41b6eec8
commit 1c2fcf4115
5 changed files with 40 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/ocaml-modules/eliom/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, ocaml, findlib, which, ocsigen_server, ocsigen_deriving, { stdenv, fetchurl, ocaml, findlib, which, ocsigen_server, ocsigen_deriving,
js_of_ocaml, ocaml_react, ocaml_lwt, calendar, cryptokit, tyxml, 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}: reactivedata, opam}:
stdenv.mkDerivation rec stdenv.mkDerivation rec
@ -17,7 +17,7 @@ stdenv.mkDerivation rec
buildInputs = [ocaml which ocsigen_server findlib ocsigen_deriving buildInputs = [ocaml which ocsigen_server findlib ocsigen_deriving
js_of_ocaml ocaml_optcomp opam]; 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 calendar cryptokit ocamlnet ocaml_react ocaml_ssl
ocaml_pcre ]; ocaml_pcre ];

32
pkgs/development/ocaml-modules/ipaddr/default.nix Normal file
View File

@ -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 ];
};
}

23
pkgs/development/ocaml-modules/ocaml-ipaddr/default.nix
View File

@ -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;
};
}

4
pkgs/development/ocaml-modules/ocsigen-server/default.nix
View File

@ -1,5 +1,5 @@
{stdenv, fetchurl, ocaml, findlib, which, ocaml_react, ocaml_ssl, {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}: libev, openssl, ocaml_sqlite3, tree, uutf}:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -11,7 +11,7 @@ stdenv.mkDerivation {
}; };
buildInputs = [ocaml which findlib ocaml_react ocaml_ssl ocaml_lwt 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]; ocaml_sqlite3 tree uutf];
configureFlags = "--root $(out) --prefix /"; configureFlags = "--root $(out) --prefix /";

4
pkgs/top-level/all-packages.nix
View File

@ -4172,6 +4172,8 @@ let
io-page = callPackage ../development/ocaml-modules/io-page { }; io-page = callPackage ../development/ocaml-modules/io-page { };
ipaddr = callPackage ../development/ocaml-modules/ipaddr { };
javalib = callPackage ../development/ocaml-modules/javalib { javalib = callPackage ../development/ocaml-modules/javalib {
extlib = ocaml_extlib_maximal; extlib = ocaml_extlib_maximal;
}; };
@ -4256,8 +4258,6 @@ let
ocamlify = callPackage ../development/tools/ocaml/ocamlify { }; ocamlify = callPackage ../development/tools/ocaml/ocamlify { };
ocaml_ipaddr = callPackage ../development/ocaml-modules/ocaml-ipaddr { };
ocaml_lwt = callPackage ../development/ocaml-modules/lwt { }; ocaml_lwt = callPackage ../development/ocaml-modules/lwt { };
ocamlmod = callPackage ../development/tools/ocaml/ocamlmod { }; ocamlmod = callPackage ../development/tools/ocaml/ocamlmod { };