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

ocamlPackages: cohttp: 2.5.0 -> 4.0.0; conduit: 2.2.2 -> 4.0.0 (#118144)

Browse Source 
* ocamlPackages.x509: 0.12.0 -> 0.13.0

https://github.com/mirleft/ocaml-x509/releases/tag/v0.13.0

* ocamlPackages.tls{,-mirage}: 0.12.8 -> 0.13.1

https://github.com/mirleft/ocaml-tls/releases/tag/v0.13.0
https://github.com/mirleft/ocaml-tls/releases/tag/v0.13.1

* ocamlPackages.ca-certs: 0.2.0 -> 0.2.1

Adds support for NIX_SSL_CERT_FILE, so we can finally run its test
suite! https://github.com/mirage/ca-certs/releases/tag/v0.2.1

* ocamlPackages.dns*: 4.6.3 -> 5.0.0

* jackline: unstable-2020-09-03 -> unstable-2021-04-23

Compatibility with tls >= 0.13.0

* ocamlPackages.ca-certs-nss: init at 3.64.0.1

* ocamlPackages.conduit: 2.2.2 -> 2.3.0

https://github.com/mirage/ocaml-conduit/releases/tag/v2.3.0

* ocamlPackages.curly: fix tests with new ca-certs behavior

* ocamlPackages.cohttp: 2.5.0 -> 4.0.0

ocamlPackages.cohttp-lwt-unix: add description

https://github.com/mirage/ocaml-cohttp/releases/tag/v4.0.0

* ocamlPackages.mirage{,-runtime,-types*}: 3.10.1 -> 3.10.3

Adjust to a few changed dependencies:
https://github.com/mirage/mirage/releases/tag/v3.10.2
https://github.com/mirage/mirage/releases/tag/v3.10.3

* ocamlPackages.conduit*: 2.3.0 -> 4.0.0

https://github.com/mirage/ocaml-conduit/releases/tag/v4.0.0

* ocamlPackages.cohttp-lwt-unix: disable tests

* ocamlPackages.dns*: 5.0.0 -> 5.0.1

https://github.com/mirage/ocaml-dns/releases/tag/v5.0.1

* ocamlPackages.awa*: 0.0.1 -> 0.0.3

https://github.com/mirage/awa-ssh/releases/tag/v0.0.2
https://github.com/mirage/awa-ssh/releases/tag/v0.0.3

* ocamlPackages.optint: 0.0.4 -> 0.1.0

https://github.com/mirage/optint/releases/tag/v0.0.5
https://github.com/mirage/optint/releases/tag/v0.1.0

* ocamlPackages.decompress: 1.3.0 -> 1.4.0

https://github.com/mirage/decompress/releases/tag/v1.4.0

* ocamlPackages.checkseum: 0.2.1 -> 0.3.1

https://github.com/mirage/checkseum/releases/tag/v0.3.0
https://github.com/mirage/checkseum/releases/tag/v0.3.1

* ocamlPackages.checkseum: allow compilation with ocaml-freestanding

* ocamlPackages.carton: 0.4.0 -> 0.4.1

https://github.com/mirage/ocaml-git/releases/tag/carton-v0.4.1

* ocamlPackages.mimic: 0.0.2 -> 0.0.3

* Upstream changed.
* https://github.com/dinosaure/mimic/releases/tag/0.0.3

* ocamlPackages.letsencrypt: 0.2.4 -> 0.2.5

* ocamlPackages.paf: 0.0.1 -> 0.0.3

* ocamlPackages.git-cohttp-mirage: remove at 3.3.3

Will be replaced by git-paf 3.4.0.

* ocamlPackages.git*: 3.3.3 -> 3.4.0

ocamlPackages.git-paf: init at 3.4.0

https://github.com/mirage/ocaml-git/releases/tag/3.4.0

* ocamlPackages.irmin*: 2.5.3 -> 2.6.0

https://github.com/mirage/irmin/releases/tag/2.6.0
This commit is contained in:
sterni
2021-05-11 06:54:15 +02:00
committed by GitHub
parent 966aa896a7
commit f93d83d21b
40 changed files with 371 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/ocaml-modules/cohttp/async.nix
+55 -17
View File
@@ -1,22 +1,60 @@
{ lib, buildDunePackage, async, cohttp, conduit-async, uri, ppx_sexp_conv
, logs, magic-mime }:
{ lib
, buildDunePackage
, ppx_sexp_conv
, base
, async
, async_kernel
, async_unix
, cohttp
, conduit-async
, uri
, uri-sexp
, logs
, fmt
, sexplib0
, ipaddr
, magic-mime
, ounit
, mirage-crypto
, core
}:
if !lib.versionAtLeast cohttp.version "0.99" then
cohttp
else if !lib.versionAtLeast async.version "0.13" then
throw "cohttp-async needs async-0.13 (hence OCaml >= 4.08)"
else
buildDunePackage {
pname = "cohttp-async";
buildDunePackage {
pname = "cohttp-async";
useDune2 = true;
inherit (cohttp) version src;
inherit (cohttp)
version
src
minimumOCamlVersion
useDune2
;
buildInputs = [ ppx_sexp_conv ];
buildInputs = [ ppx_sexp_conv ];
propagatedBuildInputs = [ async cohttp conduit-async logs magic-mime uri ];
propagatedBuildInputs = [
cohttp
conduit-async
async_kernel
async_unix
async
base
magic-mime
logs
fmt
sexplib0
uri
uri-sexp
ipaddr
];
meta = cohttp.meta // {
description = "CoHTTP implementation for the Async concurrency library";
};
}
doCheck = true;
checkInputs = [
ounit
mirage-crypto
core
];
meta = cohttp.meta // {
description = "CoHTTP implementation for the Async concurrency library";
};
}
pkgs/development/ocaml-modules/cohttp/default.nix
+6 -7
View File
@@ -1,25 +1,24 @@
{ lib, fetchurl, buildDunePackage
, ppx_fields_conv, ppx_sexp_conv, stdlib-shims
, base64, fieldslib, jsonm, re, stringext, uri-sexp
, ppx_sexp_conv, base64, jsonm, re, stringext, uri-sexp
, ocaml, fmt, alcotest
}:
buildDunePackage rec {
pname = "cohttp";
version = "2.5.5";
version = "4.0.0";
useDune2 = true;
minimumOCamlVersion = "4.04.1";
minimumOCamlVersion = "4.08";
src = fetchurl {
url = "https://github.com/mirage/ocaml-cohttp/releases/download/v${version}/cohttp-v${version}.tbz";
sha256 = "0ywmql4lp6ps2gd064ixbjzsdnnn5vk3pipm005sswl553qqwaim";
sha256 = "bd7aa4cd2c82744990ed7c49e3ee7a40324c64cb3d8509804809155e2bacd1d2";
};
buildInputs = [ jsonm ppx_fields_conv ppx_sexp_conv ];
buildInputs = [ jsonm ppx_sexp_conv ];
propagatedBuildInputs = [ base64 fieldslib re stringext uri-sexp stdlib-shims ];
propagatedBuildInputs = [ base64 re stringext uri-sexp ];
doCheck = lib.versionAtLeast ocaml.version "4.05";
checkInputs = [ fmt alcotest ];
pkgs/development/ocaml-modules/cohttp/lwt-unix.nix
+17 -8
View File
@@ -1,19 +1,28 @@
{ lib, buildDunePackage, cohttp-lwt
, conduit-lwt-unix, ppx_sexp_conv
, cmdliner, fmt, magic-mime
, conduit-lwt-unix, conduit-lwt, ppx_sexp_conv
, cmdliner, fmt, logs, magic-mime
, ounit
, cacert
}:
if !lib.versionAtLeast cohttp-lwt.version "0.99"
then cohttp-lwt
else
buildDunePackage {
pname = "cohttp-lwt-unix";
inherit (cohttp-lwt) version src meta;
inherit (cohttp-lwt) version src;
useDune2 = true;
buildInputs = [ cmdliner ppx_sexp_conv ];
propagatedBuildInputs = [ cohttp-lwt conduit-lwt-unix fmt magic-mime ];
propagatedBuildInputs = [
cohttp-lwt conduit-lwt conduit-lwt-unix fmt logs magic-mime
];
# TODO(@sternenseemann): fail for unknown reason
# https://github.com/mirage/ocaml-cohttp/issues/675#issuecomment-830692742
doCheck = false;
checkInputs = [ ounit cacert ];
meta = cohttp-lwt.meta // {
description = "CoHTTP implementation for Unix and Windows using Lwt";
};
}
pkgs/development/ocaml-modules/cohttp/lwt.nix
+15 -10
View File
@@ -1,16 +1,21 @@
{ lib, buildDunePackage, cohttp, ocaml_lwt, uri, ppx_sexp_conv, logs }:
if !lib.versionAtLeast cohttp.version "0.99"
then cohttp
else if !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
{ lib, buildDunePackage, cohttp, ocaml_lwt, uri, ppx_sexp_conv, logs, sexplib0 }:
buildDunePackage {
pname = "cohttp-lwt";
inherit (cohttp) version src useDune2 meta;
inherit (cohttp)
version
src
useDune2
minimumOCamlVersion
;
buildInputs = [ uri ppx_sexp_conv ];
buildInputs = [ ppx_sexp_conv ];
propagatedBuildInputs = [ cohttp ocaml_lwt logs ];
propagatedBuildInputs = [
cohttp ocaml_lwt logs sexplib0 uri
];
meta = cohttp.meta // {
description = "CoHTTP implementation using the Lwt concurrency library";
};
}
pkgs/development/ocaml-modules/cohttp/mirage.nix
+3
View File
@@ -2,6 +2,7 @@
, mirage-flow, mirage-channel, mirage-kv
, conduit, conduit-mirage, lwt
, astring, magic-mime
, ppx_sexp_conv
}:
buildDunePackage {
@@ -9,6 +10,8 @@ buildDunePackage {
inherit (cohttp) version src minimumOCamlVersion useDune2;
nativeBuildInputs = [ ppx_sexp_conv ];
propagatedBuildInputs = [
mirage-flow mirage-channel conduit conduit-mirage mirage-kv
lwt cohttp cohttp-lwt astring magic-mime