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.
wip/yesman
sternenseemann
4 years ago
committed by
GitHub
parent
3eb4864c8b
commit
3a0933a030
@ -1,27 +1,25 @@ |
||||
{ lib, fetchFromGitHub, buildDunePackage |
||||
, ppx_fields_conv, ppx_sexp_conv |
||||
{ lib, fetchurl, buildDunePackage |
||||
, ppx_fields_conv, ppx_sexp_conv, stdlib-shims |
||||
, base64, fieldslib, jsonm, re, stringext, uri-sexp |
||||
}: |
||||
|
||||
buildDunePackage rec { |
||||
pname = "cohttp"; |
||||
version = "2.1.3"; |
||||
pname = "cohttp"; |
||||
version = "2.5.1"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "mirage"; |
||||
repo = "ocaml-cohttp"; |
||||
rev = "v${version}"; |
||||
sha256 = "16k4ldmz6ljryhr139adlma130frb5wh13qswkrwc5gxx6d2wh8d"; |
||||
src = fetchurl { |
||||
url = "https://github.com/mirage/ocaml-cohttp/releases/download/v${version}/cohttp-v${version}.tbz"; |
||||
sha256 = "0im91mi3nxzqfd7fs5r0zg5gsparfnf5zaz13mpw247hkd3y3396"; |
||||
}; |
||||
|
||||
buildInputs = [ jsonm ppx_fields_conv ppx_sexp_conv ]; |
||||
|
||||
propagatedBuildInputs = [ base64 fieldslib re stringext uri-sexp ]; |
||||
propagatedBuildInputs = [ base64 fieldslib re stringext uri-sexp stdlib-shims ]; |
||||
|
||||
meta = { |
||||
description = "HTTP(S) library for Lwt, Async and Mirage"; |
||||
license = lib.licenses.isc; |
||||
maintainers = [ lib.maintainers.vbgl ]; |
||||
inherit (src.meta) homepage; |
||||
homepage = "https://github.com/mirage/ocaml-cohttp"; |
||||
}; |
||||
} |
||||
|
||||
@ -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"; |
||||
}; |
||||
} |
||||
|
||||
@ -1,16 +1,20 @@ |
||||
{ stdenv, buildDunePackage, conduit-lwt |
||||
, logs, ppx_sexp_conv, lwt_ssl |
||||
{ stdenv, buildDunePackage |
||||
, conduit-lwt, ppx_sexp_conv, ocaml_lwt, uri, ipaddr, ipaddr-sexp |
||||
, lwt_ssl, tls |
||||
}: |
||||
|
||||
if !stdenv.lib.versionAtLeast conduit-lwt.version "1.0" |
||||
then conduit-lwt |
||||
else |
||||
|
||||
buildDunePackage { |
||||
pname = "conduit-lwt-unix"; |
||||
inherit (conduit-lwt) version src meta; |
||||
inherit (conduit-lwt) version src minimumOCamlVersion; |
||||
|
||||
useDune2 = true; |
||||
|
||||
buildInputs = [ ppx_sexp_conv ]; |
||||
|
||||
propagatedBuildInputs = [ conduit-lwt logs lwt_ssl ]; |
||||
propagatedBuildInputs = |
||||
[ conduit-lwt ocaml_lwt uri ipaddr ipaddr-sexp tls lwt_ssl ]; |
||||
|
||||
meta = conduit-lwt.meta // { |
||||
description = "A network connection establishment library for Lwt_unix"; |
||||
}; |
||||
} |
||||
|
||||
@ -1,14 +1,14 @@ |
||||
{ stdenv, buildDunePackage, ppx_sexp_conv, conduit, ocaml_lwt }: |
||||
|
||||
if !stdenv.lib.versionAtLeast conduit.version "1.0" |
||||
then conduit |
||||
else |
||||
{ stdenv, buildDunePackage, ppx_sexp_conv, conduit, ocaml_lwt, sexplib }: |
||||
|
||||
buildDunePackage { |
||||
pname = "conduit-lwt"; |
||||
inherit (conduit) version src meta; |
||||
inherit (conduit) version src minimumOCamlVersion; |
||||
|
||||
buildInputs = [ ppx_sexp_conv ]; |
||||
|
||||
propagatedBuildInputs = [ conduit ocaml_lwt ]; |
||||
propagatedBuildInputs = [ conduit ocaml_lwt sexplib ]; |
||||
|
||||
meta = conduit.meta // { |
||||
description = "A network connection establishment library for Lwt"; |
||||
}; |
||||
} |
||||
|
||||
@ -0,0 +1,17 @@ |
||||
{ lib, buildDunePackage |
||||
, ipaddr, cstruct |
||||
}: |
||||
|
||||
buildDunePackage rec { |
||||
pname = "ipaddr-cstruct"; |
||||
|
||||
inherit (ipaddr) version src minimumOCamlVersion; |
||||
|
||||
propagatedBuildInputs = [ ipaddr cstruct ]; |
||||
|
||||
doCheck = true; |
||||
|
||||
meta = ipaddr.meta // { |
||||
description = "A library for manipulation of IP address representations using Cstructs"; |
||||
}; |
||||
} |
||||
@ -1,22 +1,20 @@ |
||||
{ lib, buildDunePackage |
||||
, macaddr, ounit |
||||
, macaddr, domain-name, stdlib-shims |
||||
, ounit, ppx_sexp_conv |
||||
}: |
||||
|
||||
buildDunePackage rec { |
||||
pname = "ipaddr"; |
||||
|
||||
inherit (macaddr) version src; |
||||
inherit (macaddr) version src minimumOCamlVersion; |
||||
|
||||
buildInputs = [ ounit ]; |
||||
|
||||
propagatedBuildInputs = [ macaddr ]; |
||||
propagatedBuildInputs = [ macaddr domain-name stdlib-shims ]; |
||||
|
||||
checkInputs = [ ppx_sexp_conv ounit ]; |
||||
doCheck = true; |
||||
|
||||
meta = with lib; { |
||||
homepage = "https://github.com/mirage/ocaml-ipaddr"; |
||||
meta = macaddr.meta // { |
||||
description = "A library for manipulation of IP (and MAC) address representations "; |
||||
license = licenses.isc; |
||||
maintainers = with maintainers; [ alexfmpe ericbmerritt ]; |
||||
maintainers = with lib.maintainers; [ alexfmpe ericbmerritt ]; |
||||
}; |
||||
} |
||||
|
||||
@ -0,0 +1,18 @@ |
||||
{ lib, buildDunePackage |
||||
, ipaddr, ipaddr-cstruct, ounit, ppx_sexp_conv |
||||
}: |
||||
|
||||
buildDunePackage rec { |
||||
pname = "ipaddr-sexp"; |
||||
|
||||
inherit (ipaddr) version src minimumOCamlVersion; |
||||
|
||||
propagatedBuildInputs = [ ipaddr ]; |
||||
|
||||
checkInputs = [ ipaddr-cstruct ounit ppx_sexp_conv ]; |
||||
doCheck = true; |
||||
|
||||
meta = ipaddr.meta // { |
||||
description = "A library for manipulation of IP address representations usnig sexp"; |
||||
}; |
||||
} |
||||
@ -0,0 +1,17 @@ |
||||
{ lib, buildDunePackage |
||||
, macaddr, cstruct |
||||
}: |
||||
|
||||
buildDunePackage { |
||||
pname = "macaddr-cstruct"; |
||||
|
||||
inherit (macaddr) version src minimumOCamlVersion; |
||||
|
||||
propagatedBuildInputs = [ macaddr cstruct ]; |
||||
|
||||
doCheck = true; |
||||
|
||||
meta = macaddr.meta // { |
||||
description = "A library for manipulation of MAC address representations using Cstructs"; |
||||
}; |
||||
} |
||||
@ -0,0 +1,18 @@ |
||||
{ lib, buildDunePackage |
||||
, macaddr, ppx_sexp_conv, macaddr-cstruct, ounit |
||||
}: |
||||
|
||||
buildDunePackage { |
||||
pname = "macaddr-sexp"; |
||||
|
||||
inherit (macaddr) version src minimumOCamlVersion; |
||||
|
||||
propagatedBuildInputs = [ ppx_sexp_conv ]; |
||||
|
||||
checkInputs = [ macaddr-cstruct ounit ]; |
||||
doCheck = true; |
||||
|
||||
meta = macaddr.meta // { |
||||
description = "A library for manipulation of MAC address representations using sexp"; |
||||
}; |
||||
} |
||||
@ -1,25 +1,27 @@ |
||||
{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, ipaddr }: |
||||
{ lib, buildDunePackage, fetchurl |
||||
, ipaddr, macaddr, cmdliner |
||||
}: |
||||
|
||||
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01"; |
||||
buildDunePackage rec { |
||||
pname = "tuntap"; |
||||
version = "2.0.0"; |
||||
|
||||
stdenv.mkDerivation { |
||||
name = "ocaml-tuntap-1.3.0"; |
||||
minimumOCamlVersion = "4.04.2"; |
||||
|
||||
src = fetchzip { |
||||
url = "https://github.com/mirage/ocaml-tuntap/archive/v1.3.0.tar.gz"; |
||||
sha256 = "1cmd4kky875ks02gm2nb8yr80hmlfcnjdfyc63hvkh49acssy3d5"; |
||||
src = fetchurl { |
||||
url = "https://github.com/mirage/ocaml-tuntap/releases/download/v${version}/tuntap-v${version}.tbz"; |
||||
sha256 = "12wmls28h3jzikwyfw08d5f7ycsc9njwzbhd3qk2l8jnf5rakfsa"; |
||||
}; |
||||
|
||||
buildInputs = [ ocaml findlib ocamlbuild ]; |
||||
propagatedBuildInputs = [ ipaddr ]; |
||||
propagatedBuildInputs = [ ipaddr macaddr cmdliner ]; |
||||
|
||||
createFindlibDestdir = true; |
||||
# tests manipulate network devices and use network |
||||
# also depend on LWT 5 |
||||
doCheck = false; |
||||
|
||||
meta = { |
||||
description = "Bindings to the UNIX tuntap facility"; |
||||
license = stdenv.lib.licenses.isc; |
||||
license = lib.licenses.isc; |
||||
homepage = "https://github.com/mirage/ocaml-tuntap"; |
||||
inherit (ocaml.meta) platforms; |
||||
}; |
||||
|
||||
} |
||||
|
||||
Loading…
Reference in new issue