diff options
author | sterni <0rpkxez4ksa01gb3typccl0i@systemli.org> | 2021-05-11 06:54:15 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-11 06:54:15 +0200 |
commit | f93d83d21b6a2d485006c4832f4850545ab7824e (patch) | |
tree | 0864b9ab4f24e2265e14720f4762eb29e7b391ec /pkgs/development/ocaml-modules/conduit | |
parent | 966aa896a71d3b3394b9bcb94534869c13411c8b (diff) | |
download | nixpkgs-f93d83d21b6a2d485006c4832f4850545ab7824e.tar nixpkgs-f93d83d21b6a2d485006c4832f4850545ab7824e.tar.gz nixpkgs-f93d83d21b6a2d485006c4832f4850545ab7824e.tar.bz2 nixpkgs-f93d83d21b6a2d485006c4832f4850545ab7824e.tar.lz nixpkgs-f93d83d21b6a2d485006c4832f4850545ab7824e.tar.xz nixpkgs-f93d83d21b6a2d485006c4832f4850545ab7824e.tar.zst nixpkgs-f93d83d21b6a2d485006c4832f4850545ab7824e.zip |
ocamlPackages: cohttp: 2.5.0 -> 4.0.0; conduit: 2.2.2 -> 4.0.0 (#118144)
* 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
Diffstat (limited to 'pkgs/development/ocaml-modules/conduit')
-rw-r--r-- | pkgs/development/ocaml-modules/conduit/async.nix | 18 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/conduit/default.nix | 10 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/conduit/lwt-unix.nix | 27 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/conduit/mirage.nix | 7 |
4 files changed, 38 insertions, 24 deletions
diff --git a/pkgs/development/ocaml-modules/conduit/async.nix b/pkgs/development/ocaml-modules/conduit/async.nix index c15ad0520fb..e78cb2bc516 100644 --- a/pkgs/development/ocaml-modules/conduit/async.nix +++ b/pkgs/development/ocaml-modules/conduit/async.nix @@ -1,17 +1,17 @@ -{ lib, buildDunePackage, async, async_ssl, ppx_sexp_conv, conduit }: - -if !lib.versionAtLeast conduit.version "1.0" -then conduit -else +{ lib, buildDunePackage, async, async_ssl, ppx_sexp_conv, ppx_here, uri, conduit }: buildDunePackage { pname = "conduit-async"; - useDune2 = true; - inherit (conduit) version src; + inherit (conduit) + version + src + minimumOCamlVersion + useDune2 + ; - buildInputs = [ ppx_sexp_conv ]; + buildInputs = [ ppx_sexp_conv ppx_here ]; - propagatedBuildInputs = [ async async_ssl conduit ]; + propagatedBuildInputs = [ async async_ssl conduit uri ]; meta = conduit.meta // { description = "A network connection establishment library for Async"; diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix index 8c9b757f87c..96f5bf43d21 100644 --- a/pkgs/development/ocaml-modules/conduit/default.nix +++ b/pkgs/development/ocaml-modules/conduit/default.nix @@ -5,18 +5,18 @@ buildDunePackage rec { pname = "conduit"; - version = "2.2.2"; + version = "4.0.0"; useDune2 = true; - minimumOCamlVersion = "4.07"; + minimumOCamlVersion = "4.03"; src = fetchurl { - url = "https://github.com/mirage/ocaml-conduit/releases/download/v2.2.2/conduit-v2.2.2.tbz"; - sha256 = "1zb83w2pq9c8xrappfxa6y5q93772f5dj22x78camsm77a2c2z55"; + url = "https://github.com/mirage/ocaml-conduit/releases/download/v${version}/conduit-v${version}.tbz"; + sha256 = "74b29d72bf47adc5d5c4cae6130ad5a2a4923118b9c571331bd1cb3c56decd2a"; }; buildInputs = [ ppx_sexp_conv ]; - propagatedBuildInputs = [ astring ipaddr ipaddr-sexp sexplib uri ]; + propagatedBuildInputs = [ astring ipaddr ipaddr-sexp sexplib uri logs ]; meta = { description = "A network connection establishment library"; diff --git a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix index ab6449b50a1..ce6016012d7 100644 --- a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix +++ b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix @@ -1,18 +1,31 @@ { buildDunePackage -, conduit-lwt, ppx_sexp_conv, ocaml_lwt, uri, ipaddr, ipaddr-sexp -, lwt_ssl, tls +, conduit-lwt, ppx_sexp_conv, ocaml_lwt, uri, ipaddr, ipaddr-sexp, ca-certs, logs +, lwt_ssl, tls, lwt_log, ssl }: buildDunePackage { pname = "conduit-lwt-unix"; - inherit (conduit-lwt) version src minimumOCamlVersion; - - useDune2 = true; + inherit (conduit-lwt) version src minimumOCamlVersion useDune2; buildInputs = [ ppx_sexp_conv ]; - propagatedBuildInputs = - [ conduit-lwt ocaml_lwt uri ipaddr ipaddr-sexp tls lwt_ssl ]; + propagatedBuildInputs = [ + conduit-lwt + ocaml_lwt + uri + ipaddr + ipaddr-sexp + tls + ca-certs + logs + lwt_ssl + ]; + + doCheck = true; + checkInputs = [ + lwt_log + ssl + ]; meta = conduit-lwt.meta // { description = "A network connection establishment library for Lwt_unix"; diff --git a/pkgs/development/ocaml-modules/conduit/mirage.nix b/pkgs/development/ocaml-modules/conduit/mirage.nix index 6100908f785..d1f636be93c 100644 --- a/pkgs/development/ocaml-modules/conduit/mirage.nix +++ b/pkgs/development/ocaml-modules/conduit/mirage.nix @@ -1,7 +1,8 @@ { buildDunePackage, conduit-lwt -, ppx_sexp_conv, sexplib, cstruct, mirage-stack, mirage-flow +, ppx_sexp_conv, sexplib, uri, cstruct, mirage-stack, mirage-flow , mirage-flow-combinators, mirage-random, mirage-time, mirage-clock , dns-client, vchan, xenstore, tls, tls-mirage, ipaddr, ipaddr-sexp +, tcpip, ca-certs-nss }: buildDunePackage { @@ -12,10 +13,10 @@ buildDunePackage { nativeBuildInputs = [ ppx_sexp_conv ]; propagatedBuildInputs = [ - sexplib cstruct mirage-stack mirage-clock mirage-flow + sexplib uri cstruct mirage-stack mirage-clock mirage-flow mirage-flow-combinators mirage-random mirage-time dns-client conduit-lwt vchan xenstore tls tls-mirage - ipaddr ipaddr-sexp + ipaddr ipaddr-sexp tcpip ca-certs-nss ]; meta = conduit-lwt.meta // { |