b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

ocamlPackages.dns: 5.0.1 → 6.1.4

Browse source 
ocamlPackages.conduit: 4.0.2 → 5.1.0

ocamlPackages.cohttp: 4.0.0 → 5.0.0

ocamlPackages.ocsigen_server: fix compatibility with cohttp-5.0.0
This commit is contained in:
Vincent Laporte 2022-06-30 06:29:12 +01:00 committed by Vincent Laporte
parent 26a6c659f0
commit a8406971c3
21 changed files with 99 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/ocaml-modules/cohttp/async.nix
View file

@ -7,6 +7,7 @@
, async_unix
, cohttp
, conduit-async
, core_unix
, uri
, uri-sexp
, logs
@ -25,8 +26,6 @@ buildDunePackage {
inherit (cohttp)
version
src
minimumOCamlVersion
useDune2
;
buildInputs = [ ppx_sexp_conv ];
@ -38,6 +37,7 @@ buildDunePackage {
async_unix
async
base
core_unix
magic-mime
logs
fmt

15
pkgs/development/ocaml-modules/cohttp/default.nix
View file

@ -1,27 +1,26 @@
{ lib, fetchurl, buildDunePackage
, ppx_sexp_conv, base64, jsonm, re, stringext, uri-sexp
, ocaml, fmt, alcotest
, crowbar
}:
buildDunePackage rec {
pname = "cohttp";
version = "4.0.0";
version = "5.0.0";
useDune2 = true;
minimumOCamlVersion = "4.08";
minimalOCamlVersion = "4.08";
src = fetchurl {
url = "https://github.com/mirage/ocaml-cohttp/releases/download/v${version}/cohttp-v${version}.tbz";
sha256 = "bd7aa4cd2c82744990ed7c49e3ee7a40324c64cb3d8509804809155e2bacd1d2";
url = "https://github.com/mirage/ocaml-cohttp/releases/download/v${version}/cohttp-${version}.tbz";
sha256 = "sha256-/W/0uGyBg1XWGzoIYoWW2/UX1qfabo7exIG7BlPKWgU=";
};
buildInputs = [ jsonm ppx_sexp_conv ];
propagatedBuildInputs = [ base64 re stringext uri-sexp ];
doCheck = lib.versionAtLeast ocaml.version "4.05";
checkInputs = [ fmt alcotest ];
doCheck = true;
checkInputs = [ fmt alcotest crowbar ];
meta = {
description = "HTTP(S) library for Lwt, Async and Mirage";

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

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

6
pkgs/development/ocaml-modules/cohttp/lwt.nix
View file

@ -1,18 +1,16 @@
{ lib, buildDunePackage, cohttp, ocaml_lwt, uri, ppx_sexp_conv, logs, sexplib0 }:
{ lib, buildDunePackage, cohttp, lwt, uri, ppx_sexp_conv, logs, sexplib0 }:
buildDunePackage {
pname = "cohttp-lwt";
inherit (cohttp)
version
src
useDune2
minimumOCamlVersion
;
buildInputs = [ ppx_sexp_conv ];
propagatedBuildInputs = [
cohttp ocaml_lwt logs sexplib0 uri
cohttp lwt logs sexplib0 uri
];
meta = cohttp.meta // {

2
pkgs/development/ocaml-modules/cohttp/mirage.nix
View file

@ -8,7 +8,7 @@
buildDunePackage {
pname = "cohttp-mirage";
inherit (cohttp) version src minimumOCamlVersion useDune2;
inherit (cohttp) version src;
nativeBuildInputs = [ ppx_sexp_conv ];

2
pkgs/development/ocaml-modules/conduit/async.nix
View file

@ -7,8 +7,6 @@ buildDunePackage {
inherit (conduit)
version
src
minimumOCamlVersion
useDune2
;
buildInputs = [ ppx_sexp_conv ppx_here ];

13
pkgs/development/ocaml-modules/conduit/default.nix
View file

@ -1,21 +1,20 @@
{ lib, fetchurl, buildDunePackage
, ppx_sexp_conv, sexplib, astring, uri, logs
, ppx_sexp_conv, sexplib, astring, uri
, ipaddr, ipaddr-sexp
}:
buildDunePackage rec {
pname = "conduit";
version = "4.0.2";
useDune2 = true;
version = "5.1.0";
minimumOCamlVersion = "4.03";
minimalOCamlVersion = "4.03";
src = fetchurl {
url = "https://github.com/mirage/ocaml-conduit/releases/download/v${version}/conduit-v${version}.tbz";
sha256 = "2a37ffaa352a1e145ef3d80ac28661213c69a741b238623e59f29e3d5a12c537";
url = "https://github.com/mirage/ocaml-conduit/releases/download/v${version}/conduit-${version}.tbz";
sha256 = "sha256-5RyMPoecu+ngmYmwBZUJODLchmQgiAcuA+Wlmiojkc0=";
};
propagatedBuildInputs = [ astring ipaddr ipaddr-sexp sexplib uri logs ppx_sexp_conv ];
propagatedBuildInputs = [ astring ipaddr ipaddr-sexp sexplib uri ppx_sexp_conv ];
meta = {
description = "A network connection establishment library";

6
pkgs/development/ocaml-modules/conduit/lwt-unix.nix
View file

@ -1,17 +1,17 @@
{ buildDunePackage
, conduit-lwt, ppx_sexp_conv, ocaml_lwt, uri, ipaddr, ipaddr-sexp, ca-certs, logs
, conduit-lwt, ppx_sexp_conv, 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;
inherit (conduit-lwt) version src;
buildInputs = [ ppx_sexp_conv ];
propagatedBuildInputs = [
conduit-lwt
ocaml_lwt
lwt
uri
ipaddr
ipaddr-sexp

6
pkgs/development/ocaml-modules/conduit/lwt.nix
View file

@ -1,12 +1,12 @@
{ buildDunePackage, ppx_sexp_conv, conduit, ocaml_lwt, sexplib }:
{ buildDunePackage, ppx_sexp_conv, conduit, lwt, sexplib }:
buildDunePackage {
pname = "conduit-lwt";
inherit (conduit) version src useDune2 minimumOCamlVersion;
inherit (conduit) version src;
buildInputs = [ ppx_sexp_conv ];
propagatedBuildInputs = [ conduit ocaml_lwt sexplib ];
propagatedBuildInputs = [ conduit lwt sexplib ];
meta = conduit.meta // {
description = "A network connection establishment library for Lwt";

6
pkgs/development/ocaml-modules/conduit/mirage.nix
View file

@ -1,5 +1,5 @@
{ buildDunePackage, conduit-lwt
, ppx_sexp_conv, sexplib, uri, cstruct, mirage-stack, mirage-flow
, ppx_sexp_conv, sexplib, uri, cstruct, 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
@ -8,12 +8,12 @@
buildDunePackage {
pname = "conduit-mirage";
inherit (conduit-lwt) version src minimumOCamlVersion useDune2;
inherit (conduit-lwt) version src;
nativeBuildInputs = [ ppx_sexp_conv ];
propagatedBuildInputs = [
sexplib uri cstruct mirage-stack mirage-clock mirage-flow
sexplib uri cstruct mirage-clock mirage-flow
mirage-flow-combinators mirage-random mirage-time
dns-client conduit-lwt vchan xenstore tls tls-mirage
ipaddr ipaddr-sexp tcpip ca-certs-nss

7
pkgs/development/ocaml-modules/dns/certify.nix
View file

@ -1,12 +1,13 @@
{ buildDunePackage, dns, dns-tsig, dns-mirage, randomconv, x509
, mirage-random, mirage-time, mirage-clock, mirage-stack
, mirage-random, mirage-time, mirage-clock
, logs, mirage-crypto-pk, mirage-crypto-rng, mirage-crypto-ec, lwt
, tcpip
}:
buildDunePackage {
pname = "dns-certify";
inherit (dns) version src useDune2 minimumOCamlVersion;
inherit (dns) version src;
propagatedBuildInputs = [
dns
@ -17,12 +18,12 @@ buildDunePackage {
mirage-random
mirage-time
mirage-clock
mirage-stack
logs
mirage-crypto-pk
mirage-crypto-rng
mirage-crypto-ec
lwt
tcpip
];
doCheck = true;

7
pkgs/development/ocaml-modules/dns/cli.nix
View file

@ -1,5 +1,5 @@
{ buildDunePackage, dns, dns-tsig, dns-client, dns-server, dns-certify
, rresult, bos, cmdliner, fpath, x509, mirage-crypto, mirage-crypto-pk
, bos, cmdliner, fpath, x509, mirage-crypto, mirage-crypto-pk
, mirage-crypto-rng, hex, ptime, mtime, logs, fmt, ipaddr, lwt
, randomconv, alcotest
}:
@ -7,9 +7,9 @@
buildDunePackage {
pname = "dns-cli";
minimumOCamlVersion = "4.08";
minimalOCamlVersion = "4.08";
inherit (dns) version src useDune2;
inherit (dns) version src;
# no need to propagate as this is primarily
# an executable package
@ -19,7 +19,6 @@ buildDunePackage {
dns-client
dns-server
dns-certify
rresult
bos
cmdliner
fpath

18
pkgs/development/ocaml-modules/dns/client.nix
View file

@ -1,15 +1,19 @@
{ lib, buildDunePackage, dns, ocaml_lwt, mirage-clock, mirage-time
, mirage-random, mirage-stack, mirage-crypto-rng, mtime, randomconv
, cstruct, fmt, logs, rresult, domain-name, ipaddr, alcotest }:
{ lib, buildDunePackage, dns, lwt, mirage-clock, mirage-time
, mirage-random, mirage-crypto-rng, mtime, randomconv
, cstruct, fmt, logs, rresult, domain-name, ipaddr, alcotest
, ca-certs, ca-certs-nss
, happy-eyeballs
, tcpip
, tls, tls-mirage
}:
buildDunePackage {
pname = "dns-client";
inherit (dns) src version;
useDune2 = true;
propagatedBuildInputs = [ cstruct fmt logs dns rresult randomconv domain-name ipaddr
ocaml_lwt mirage-stack mirage-random mirage-time mirage-clock
propagatedBuildInputs = [ cstruct fmt logs dns randomconv domain-name ipaddr
lwt mirage-random mirage-time mirage-clock
ca-certs ca-certs-nss happy-eyeballs tcpip tls tls-mirage
mtime mirage-crypto-rng ];
checkInputs = [ alcotest ];
doCheck = true;

15
pkgs/development/ocaml-modules/dns/default.nix
View file

@ -1,23 +1,22 @@
{ lib, buildDunePackage, fetchurl, alcotest
, cstruct, domain-name, duration, gmap, ipaddr, logs, lru, metrics, ptime, rresult, astring, fmt
, cstruct, domain-name, duration, gmap, ipaddr, logs, lru, metrics, ptime, fmt
}:
buildDunePackage rec {
pname = "dns";
version = "5.0.1";
version = "6.1.4";
useDune2 = true;
minimumOCamlVersion = "4.07";
minimalOCamlVersion = "4.08";
src = fetchurl {
url = "https://github.com/mirage/ocaml-dns/releases/download/v${version}/dns-v${version}.tbz";
sha256 = "72c0a1a91c8e409bd448c8e0ea28d16d13177c326aea403ee1c30ddcb5969adc";
url = "https://github.com/mirage/ocaml-dns/releases/download/v${version}/dns-${version}.tbz";
sha256 = "sha256-nO9hRFOQzm3j57S1xTUC/j8ejSB+aDcsw/pOi893kHY=";
};
propagatedBuildInputs = [ rresult astring fmt logs ptime domain-name gmap cstruct ipaddr lru duration metrics ];
propagatedBuildInputs = [ fmt logs ptime domain-name gmap cstruct ipaddr lru duration metrics ];
doCheck = true;
checkInputs = lib.optional doCheck alcotest;
checkInputs = [ alcotest ];
meta = {
description = "An Domain Name System (DNS) library";

6
pkgs/development/ocaml-modules/dns/mirage.nix
View file

@ -1,15 +1,15 @@
{ buildDunePackage, dns, mirage-stack, ipaddr, lwt }:
{ buildDunePackage, dns, ipaddr, lwt, tcpip }:
buildDunePackage {
pname = "dns-mirage";
inherit (dns) version src useDune2 minimumOCamlVersion;
inherit (dns) version src;
propagatedBuildInputs = [
dns
mirage-stack
ipaddr
lwt
tcpip
];
meta = dns.meta // {

6
pkgs/development/ocaml-modules/dns/resolver.nix
View file

@ -1,12 +1,13 @@
{ buildDunePackage, dns, dns-server, dns-mirage, lru, duration
, randomconv, lwt, mirage-time, mirage-clock, mirage-random
, tcpip, tls, tls-mirage
, alcotest
}:
buildDunePackage {
pname = "dns-resolver";
inherit (dns) version src useDune2 minimumOCamlVersion;
inherit (dns) version src;
propagatedBuildInputs = [
dns
@ -19,6 +20,9 @@ buildDunePackage {
mirage-time
mirage-clock
mirage-random
tcpip
tls
tls-mirage
];
doCheck = true;

5
pkgs/development/ocaml-modules/dns/server.nix
View file

@ -1,12 +1,12 @@
{ buildDunePackage, dns, dns-mirage, randomconv, duration, lwt
, mirage-time, mirage-clock, mirage-stack, metrics
, mirage-time, mirage-clock, metrics
, alcotest, mirage-crypto-rng, dns-tsig, base64
}:
buildDunePackage {
pname = "dns-server";
inherit (dns) version src useDune2 minimumOCamlVersion;
inherit (dns) version src;
propagatedBuildInputs = [
dns
@ -16,7 +16,6 @@ buildDunePackage {
lwt
mirage-time
mirage-clock
mirage-stack
metrics
];

6
pkgs/development/ocaml-modules/dns/stub.nix
View file

@ -1,12 +1,12 @@
{ buildDunePackage, dns, dns-client, dns-mirage, dns-resolver, dns-tsig
, dns-server, duration, randomconv, lwt, mirage-time, mirage-clock
, mirage-random, mirage-stack, metrics
, mirage-random, tcpip, metrics
}:
buildDunePackage {
pname = "dns-stub";
inherit (dns) version src useDune2 minimumOCamlVersion;
inherit (dns) version src;
propagatedBuildInputs = [
dns
@ -21,7 +21,7 @@ buildDunePackage {
mirage-time
mirage-clock
mirage-random
mirage-stack
tcpip
metrics
];

2
pkgs/development/ocaml-modules/dns/tsig.nix
View file

@ -3,7 +3,7 @@
buildDunePackage {
pname = "dns-tsig";
inherit (dns) version src useDune2 minimumOCamlVersion;
inherit (dns) version src;
propagatedBuildInputs = [
mirage-crypto

31
pkgs/development/ocaml-modules/ocsigen-server/cohttp-5.patch Normal file
View file

@ -0,0 +1,31 @@
diff --git a/src/server/ocsigen_cohttp.ml b/src/server/ocsigen_cohttp.ml
index 4363cff7..b0cc0c53 100644
--- a/src/server/ocsigen_cohttp.ml
+++ b/src/server/ocsigen_cohttp.ml
@@ -14,25 +14,13 @@ exception Ext_http_error of
let _print_request fmt request =
- let print_list print_data out_ch lst =
- let rec aux = function
- | [] -> ()
- | [ x ] -> print_data out_ch x
- | x :: r -> print_data out_ch x; aux r
- in aux lst
- in
-
Format.fprintf fmt "%s [%s/%s]:\n"
(Uri.to_string (Cohttp.Request.uri request))
Cohttp.(Code.string_of_version (Request.version request))
Cohttp.(Code.string_of_method (Request.meth request));
Cohttp.Header.iter
- (fun key values ->
- (print_list
- (fun fmt value -> Format.fprintf fmt "\t%s = %s\n" key value)
- fmt
- values))
+ (Format.fprintf fmt "\t%s = %s\n")
(Cohttp.Request.headers request)
let connections = Hashtbl.create 256

2
pkgs/development/ocaml-modules/ocsigen-server/default.nix
View file

@ -37,6 +37,8 @@ buildDunePackage rec {
ocaml_pcre xml-light
];
patches = [ ./cohttp-5.patch ];
configureFlags = [ "--root $(out)" "--prefix /" "--temproot ''" ];
dontAddPrefix = true;