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

ocamlPackages.{ipaddr,macaddr}: 3.1.0 → 5.0.0 and update all affected packages (tuntap, conduit, cohttp, …) (#91350)

Browse Source 
* 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:
sternenseemann
2020-06-25 23:22:21 +02:00
committed by GitHub
parent 3eb4864c8b
commit 3a0933a030
23 changed files with 166 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/ocaml-modules/conduit/default.nix
+11 -11
View File
@@ -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";
};
}
pkgs/development/ocaml-modules/conduit/lwt-unix.nix
+12 -8
View File
@@ -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";
};
}
pkgs/development/ocaml-modules/conduit/lwt.nix
+7 -7
View File
@@ -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";
};
}