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

ocamlPackages.conduit: 1.0.0 -> 1.4.0 and dependencies (#74821)

Browse Source
This commit is contained in:
Alexandre Esteves 2019-12-29 19:40:36 +00:00 committed by Vincent Laporte
parent af2eaec41a
commit be90b35b9e
4 changed files with 56 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pkgs/development/ocaml-modules/conduit/default.nix
View File

@ -1,26 +1,26 @@
{ stdenv, fetchFromGitHub, buildDunePackage { stdenv, fetchFromGitHub, buildDunePackage
, ppx_sexp_conv , ppx_sexp_conv, sexplib
, astring, ipaddr, uri , astring, ipaddr, macaddr, uri,
}: }:
buildDunePackage rec { buildDunePackage rec {
pname = "conduit"; pname = "conduit";
version = "1.0.0"; version = "1.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mirage"; owner = "mirage";
repo = "ocaml-conduit"; repo = "ocaml-conduit";
rev = "v${version}"; rev = "v${version}";
sha256 = "1ryigzh7sfif1mly624fpm87aw5h60n5wzdlrvqsf71qcpxc6iiz"; sha256 = "1qzamqcmf9ywz04bkwrv17mz9j6zq2w9h1xmnjvp11pnwrs2xq8l";
}; };
buildInputs = [ ppx_sexp_conv ]; buildInputs = [ ppx_sexp_conv ];
propagatedBuildInputs = [ astring ipaddr uri ]; propagatedBuildInputs = [ astring ipaddr macaddr sexplib uri ];
meta = { meta = {
description = "Network connection library for TCP and SSL"; description = "Network connection library for TCP and SSL";
license = stdenv.lib.licenses.isc; license = stdenv.lib.licenses.isc;
maintainers = [ stdenv.lib.maintainers.vbgl ]; maintainers = with stdenv.lib.maintainers; [ alexfmpe vbgl ];
inherit (src.meta) homepage; inherit (src.meta) homepage;
}; };
} }

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

@ -1,20 +1,22 @@
{ stdenv, fetchurl, buildDunePackage, sexplib, ppx_sexp_conv }: { lib, buildDunePackage
, macaddr, ounit
}:
buildDunePackage rec { buildDunePackage rec {
pname = "ipaddr"; pname = "ipaddr";
version = "2.8.0";
src = fetchurl { inherit (macaddr) version src;
url = "https://github.com/mirage/ocaml-${pname}/archive/${version}.tar.gz";
sha256 = "1amb1pbm9ybpxy6190qygpj6nmbzzs2r6vx4xh5r6v89szx9rfxw";
};
propagatedBuildInputs = [ ppx_sexp_conv sexplib ]; buildInputs = [ ounit ];
meta = with stdenv.lib; { propagatedBuildInputs = [ macaddr ];
doCheck = true;
meta = with lib; {
homepage = https://github.com/mirage/ocaml-ipaddr; homepage = https://github.com/mirage/ocaml-ipaddr;
description = "A library for manipulation of IP (and MAC) address representations "; description = "A library for manipulation of IP (and MAC) address representations ";
license = licenses.isc; license = licenses.isc;
maintainers = [ maintainers.ericbmerritt ]; maintainers = with maintainers; [ alexfmpe ericbmerritt ];
}; };
} }

26
pkgs/development/ocaml-modules/macaddr/default.nix Normal file
View File

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

2
pkgs/top-level/ocaml-packages.nix
View File

@ -506,6 +506,8 @@ let
lwt = ocaml_lwt; lwt = ocaml_lwt;
}; };
macaddr = callPackage ../development/ocaml-modules/macaddr { };
macaque = callPackage ../development/ocaml-modules/macaque { }; macaque = callPackage ../development/ocaml-modules/macaque { };
magic-mime = callPackage ../development/ocaml-modules/magic-mime { }; magic-mime = callPackage ../development/ocaml-modules/magic-mime { };