ocamlPackages.{ipaddr,macaddr}: 3.1.0 → 5.0.0 and update all affected packages (tuntap, conduit, cohttp, …) (#91350)
* ocamlPackages.{ipaddr,macaddr}: 3.1.0 → 5.0.0
* ipaddr-cstruct: new package (since 4.0.0)
* ipaddr-sexp: new package (since 4.0.0)
* macaddr-cstruct: new package (since 4.0.0)
* macaddr-sexp: new package (since 4.0.0)
* macaddr: enable tests (don't depend on ipaddr anymore)
* ocamlPackages.tuntap: 1.3.0 → 2.0.0
* ocamlPackages.conduit{,-lwt,-lwt-unix}: 1.4.0 → 2.2.2
* ocamlPackages.cohttp{,-lwt,-lwt-unix}: 2.1.3 → 2.5.1
* ocamlPackages: use dune 2 if pkg (indirectly) depends on cohttp-lwt-unix
dune refuses to build a package if one of its dependencies uses dune 2.
This commit is contained in:
@@ -1,26 +1,26 @@
|
||||
{ stdenv, fetchFromGitHub, buildDunePackage
|
||||
, ppx_sexp_conv, sexplib
|
||||
, astring, ipaddr, macaddr, uri,
|
||||
{ stdenv, fetchurl, buildDunePackage
|
||||
, ppx_sexp_conv, sexplib, astring, uri, logs
|
||||
, ipaddr, ipaddr-sexp
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "conduit";
|
||||
version = "1.4.0";
|
||||
version = "2.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mirage";
|
||||
repo = "ocaml-conduit";
|
||||
rev = "v${version}";
|
||||
sha256 = "1qzamqcmf9ywz04bkwrv17mz9j6zq2w9h1xmnjvp11pnwrs2xq8l";
|
||||
minimumOCamlVersion = "4.07";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/ocaml-conduit/releases/download/v2.2.2/conduit-v2.2.2.tbz";
|
||||
sha256 = "1zb83w2pq9c8xrappfxa6y5q93772f5dj22x78camsm77a2c2z55";
|
||||
};
|
||||
|
||||
buildInputs = [ ppx_sexp_conv ];
|
||||
propagatedBuildInputs = [ astring ipaddr macaddr sexplib uri ];
|
||||
propagatedBuildInputs = [ astring ipaddr ipaddr-sexp sexplib uri ];
|
||||
|
||||
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;
|
||||
homepage = "https://github.com/mirage/ocaml-conduit";
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user