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

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

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

2
pkgs/development/ocaml-modules/cohttp/lwt-unix.nix
View File

@@ -11,6 +11,8 @@ buildDunePackage {
pname = "cohttp-lwt-unix";
inherit (cohttp-lwt) version src meta;
useDune2 = true;
buildInputs = [ cmdliner ppx_sexp_conv ];
propagatedBuildInputs = [ cohttp-lwt conduit-lwt-unix fmt magic-mime ];

2
pkgs/development/ocaml-modules/cohttp/lwt.nix
View File

@@ -2,6 +2,8 @@
if !stdenv.lib.versionAtLeast cohttp.version "0.99"
then cohttp
else if !stdenv.lib.versionAtLeast ppx_sexp_conv.version "0.13"
then throw "cohttp-lwt is not available for ppx_sexp_conv version ${ppx_sexp_conv.version}"
else
buildDunePackage {