diff options
author | Alexandre Esteves <2335822+alexfmpe@users.noreply.github.com> | 2019-12-29 19:40:36 +0000 |
---|---|---|
committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2019-12-29 20:40:36 +0100 |
commit | be90b35b9efbd7baaa80f367ffc41609531a8fe2 (patch) | |
tree | 7602920ad7ee8643608e2eede9245ca2491b1d23 /pkgs/development/ocaml-modules | |
parent | af2eaec41a18ca30c38512dd1e6de8fa8107f7e4 (diff) | |
download | nixpkgs-be90b35b9efbd7baaa80f367ffc41609531a8fe2.tar nixpkgs-be90b35b9efbd7baaa80f367ffc41609531a8fe2.tar.gz nixpkgs-be90b35b9efbd7baaa80f367ffc41609531a8fe2.tar.bz2 nixpkgs-be90b35b9efbd7baaa80f367ffc41609531a8fe2.tar.lz nixpkgs-be90b35b9efbd7baaa80f367ffc41609531a8fe2.tar.xz nixpkgs-be90b35b9efbd7baaa80f367ffc41609531a8fe2.tar.zst nixpkgs-be90b35b9efbd7baaa80f367ffc41609531a8fe2.zip |
ocamlPackages.conduit: 1.0.0 -> 1.4.0 and dependencies (#74821)
Diffstat (limited to 'pkgs/development/ocaml-modules')
-rw-r--r-- | pkgs/development/ocaml-modules/conduit/default.nix | 34 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/ipaddr/default.nix | 20 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/macaddr/default.nix | 26 |
3 files changed, 54 insertions, 26 deletions
diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix index 39234e86ef1..22538b87f6a 100644 --- a/pkgs/development/ocaml-modules/conduit/default.nix +++ b/pkgs/development/ocaml-modules/conduit/default.nix @@ -1,26 +1,26 @@ { stdenv, fetchFromGitHub, buildDunePackage -, ppx_sexp_conv -, astring, ipaddr, uri +, ppx_sexp_conv, sexplib +, astring, ipaddr, macaddr, uri, }: buildDunePackage rec { pname = "conduit"; - version = "1.0.0"; + version = "1.4.0"; - src = fetchFromGitHub { - owner = "mirage"; - repo = "ocaml-conduit"; - rev = "v${version}"; - sha256 = "1ryigzh7sfif1mly624fpm87aw5h60n5wzdlrvqsf71qcpxc6iiz"; - }; + src = fetchFromGitHub { + owner = "mirage"; + repo = "ocaml-conduit"; + rev = "v${version}"; + sha256 = "1qzamqcmf9ywz04bkwrv17mz9j6zq2w9h1xmnjvp11pnwrs2xq8l"; + }; - buildInputs = [ ppx_sexp_conv ]; - propagatedBuildInputs = [ astring ipaddr uri ]; + buildInputs = [ ppx_sexp_conv ]; + propagatedBuildInputs = [ astring ipaddr macaddr sexplib uri ]; - meta = { - description = "Network connection library for TCP and SSL"; - license = stdenv.lib.licenses.isc; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - inherit (src.meta) homepage; - }; + meta = { + description = "Network connection library for TCP and SSL"; + license = stdenv.lib.licenses.isc; + maintainers = with stdenv.lib.maintainers; [ alexfmpe vbgl ]; + inherit (src.meta) homepage; + }; } diff --git a/pkgs/development/ocaml-modules/ipaddr/default.nix b/pkgs/development/ocaml-modules/ipaddr/default.nix index 3d5959fe64e..be76e413c36 100644 --- a/pkgs/development/ocaml-modules/ipaddr/default.nix +++ b/pkgs/development/ocaml-modules/ipaddr/default.nix @@ -1,20 +1,22 @@ -{ stdenv, fetchurl, buildDunePackage, sexplib, ppx_sexp_conv }: +{ lib, buildDunePackage +, macaddr, ounit +}: buildDunePackage rec { pname = "ipaddr"; - version = "2.8.0"; - src = fetchurl { - url = "https://github.com/mirage/ocaml-${pname}/archive/${version}.tar.gz"; - sha256 = "1amb1pbm9ybpxy6190qygpj6nmbzzs2r6vx4xh5r6v89szx9rfxw"; - }; + inherit (macaddr) version src; + + buildInputs = [ ounit ]; + + propagatedBuildInputs = [ macaddr ]; - propagatedBuildInputs = [ ppx_sexp_conv sexplib ]; + doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://github.com/mirage/ocaml-ipaddr; description = "A library for manipulation of IP (and MAC) address representations "; license = licenses.isc; - maintainers = [ maintainers.ericbmerritt ]; + maintainers = with maintainers; [ alexfmpe ericbmerritt ]; }; } diff --git a/pkgs/development/ocaml-modules/macaddr/default.nix b/pkgs/development/ocaml-modules/macaddr/default.nix new file mode 100644 index 00000000000..7061fdf5d5b --- /dev/null +++ b/pkgs/development/ocaml-modules/macaddr/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchurl, buildDunePackage +, ppx_sexp_conv +}: + +buildDunePackage rec { + pname = "macaddr"; + version = "3.1.0"; + + minimumOCamlVersion = "4.04"; + + src = fetchurl { + url = "https://github.com/mirage/ocaml-ipaddr/archive/v${version}.tar.gz"; + sha256 = "1hi3v5dzg6h4qb268ch3h6v61gsc8bv21ajhb35z37v5nsdmyzbh"; + }; + + propagatedBuildInputs = [ ppx_sexp_conv ]; + + doCheck = false; # ipaddr and macaddr tests are together, which requires mutual dependency + + meta = with lib; { + homepage = https://github.com/mirage/ocaml-ipaddr; + description = "A library for manipulation of MAC address representations"; + license = licenses.isc; + maintainers = [ maintainers.alexfmpe ]; + }; +} |