diff options
| author | sternenseemann <git@lukasepple.de> | 2017-02-18 22:54:02 +0100 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-02-23 08:01:29 +0000 |
| commit | 8352e0b38c65a736219619d8821ad50f787e58d1 (patch) | |
| tree | f07487c56fcc4de043a9a017b05873319c56e1d9 /pkgs/development/ocaml-modules/ipaddr | |
| parent | 6c37a92b2bdb77465b9486e904b83895b2b45596 (diff) | |
| download | nixlib-8352e0b38c65a736219619d8821ad50f787e58d1.tar nixlib-8352e0b38c65a736219619d8821ad50f787e58d1.tar.gz nixlib-8352e0b38c65a736219619d8821ad50f787e58d1.tar.bz2 nixlib-8352e0b38c65a736219619d8821ad50f787e58d1.tar.lz nixlib-8352e0b38c65a736219619d8821ad50f787e58d1.tar.xz nixlib-8352e0b38c65a736219619d8821ad50f787e58d1.tar.zst nixlib-8352e0b38c65a736219619d8821ad50f787e58d1.zip | |
ocaml-ipaddr: 2.6.1 -> 2.7.2
Keeps the legacy version under attribute `ipaddr_p4`; it is needed for OCaml < 4.02 and some libraries (eg `conduit`).
Diffstat (limited to 'pkgs/development/ocaml-modules/ipaddr')
| -rw-r--r-- | pkgs/development/ocaml-modules/ipaddr/2.6.1.nix | 32 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/ipaddr/default.nix | 22 |
2 files changed, 39 insertions, 15 deletions
diff --git a/pkgs/development/ocaml-modules/ipaddr/2.6.1.nix b/pkgs/development/ocaml-modules/ipaddr/2.6.1.nix new file mode 100644 index 000000000000..cdc273d6ecfd --- /dev/null +++ b/pkgs/development/ocaml-modules/ipaddr/2.6.1.nix @@ -0,0 +1,32 @@ +{stdenv, buildOcaml, fetchurl, sexplib_p4}: + +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_p4 ]; + + 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/ipaddr/default.nix b/pkgs/development/ocaml-modules/ipaddr/default.nix index cdc273d6ecfd..0b561ab6d695 100644 --- a/pkgs/development/ocaml-modules/ipaddr/default.nix +++ b/pkgs/development/ocaml-modules/ipaddr/default.nix @@ -1,27 +1,19 @@ -{stdenv, buildOcaml, fetchurl, sexplib_p4}: +{ stdenv, buildOcaml, fetchurl, ocamlbuild, findlib +, topkg, sexplib, ppx_sexp_conv, opam }: buildOcaml rec { name = "ipaddr"; - version = "2.6.1"; + version = "2.7.2"; src = fetchurl { url = "https://github.com/mirage/ocaml-ipaddr/archive/${version}.tar.gz"; - sha256 = "7051013d8f58abff433187d70cd7ddd7a6b49a6fbe6cad1893f571f65b8ed3d0"; + sha256 = "0mnjw1xjr8vyn5x1nnbbxfxhs77znwrkz8c144w47zk2pc3xrh9d"; }; - propagatedBuildInputs = [ sexplib_p4 ]; + buildInputs = [ findlib ocamlbuild topkg ppx_sexp_conv opam ]; + propagatedBuildInputs = [ sexplib ]; - configurePhase = '' - ocaml setup.ml -configure --prefix $out - ''; - - buildPhase = '' - make build - ''; - - installPhase = '' - make install - ''; + inherit (topkg) buildPhase installPhase; meta = with stdenv.lib; { homepage = https://github.com/mirage/ocaml-ipaddr; |