Merge pull request #258641 from vbgl/ocaml-ocsigenserver-5.1.0
ocamlPackages.ocsigen_server: 5.0.1 → 5.1.0
This commit is contained in:
commit
2f1fd64681
|
@ -8,6 +8,7 @@
|
|||
, opaline
|
||||
, ocamlbuild
|
||||
, ppx_deriving
|
||||
, ppx_optcomp
|
||||
, findlib
|
||||
, js_of_ocaml-ocamlbuild
|
||||
, js_of_ocaml-ppx
|
||||
|
@ -21,13 +22,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "eliom";
|
||||
version = "9.4.0";
|
||||
version = "10.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ocsigen";
|
||||
repo = "eliom";
|
||||
rev = version;
|
||||
sha256 = "sha256:1yn8mqxv9yz51x81j8wv1jn7l7crm8azp1m2g4zn5nz2s4nmfv6q";
|
||||
hash = "sha256-nzrLl8adaRW6c+IQfJ7s+7KtFT8uU27Umyrv0aWXuxw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -41,6 +42,7 @@ stdenv.mkDerivation rec {
|
|||
js_of_ocaml-ocamlbuild
|
||||
js_of_ocaml-ppx_deriving_json
|
||||
ocamlnet
|
||||
ppx_optcomp
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -1,31 +0,0 @@
|
|||
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
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, buildDunePackage, fetchFromGitHub, which, ocaml, lwt_react, ssl, lwt_ssl, findlib
|
||||
, bigstringaf, lwt, cstruct, mirage-crypto, zarith, mirage-crypto-ec, ptime, mirage-crypto-rng, mtime, ca-certs
|
||||
, cohttp, cohttp-lwt-unix, hmap
|
||||
, lwt_log, ocaml_pcre, cryptokit, xml-light, ipaddr
|
||||
, lwt_log, re, cryptokit, xml-light, ipaddr
|
||||
, camlzip
|
||||
, makeWrapper
|
||||
}:
|
||||
|
@ -12,33 +12,30 @@ in
|
|||
|
||||
let caml_ld_library_path =
|
||||
lib.concatMapStringsSep ":" mkpath [
|
||||
bigstringaf lwt ssl cstruct mirage-crypto zarith mirage-crypto-ec ptime mirage-crypto-rng mtime ca-certs cryptokit ocaml_pcre
|
||||
bigstringaf lwt ssl cstruct mirage-crypto zarith mirage-crypto-ec ptime mirage-crypto-rng mtime ca-certs cryptokit re
|
||||
]
|
||||
; in
|
||||
|
||||
buildDunePackage rec {
|
||||
version = "5.0.1";
|
||||
version = "5.1.0";
|
||||
pname = "ocsigenserver";
|
||||
|
||||
duneVersion = "3";
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ocsigen";
|
||||
repo = "ocsigenserver";
|
||||
rev = version;
|
||||
sha256 = "sha256:1vzza33hd41740dqrx4854rqpyd8wv7kwpsvvmlpck841i9lh8h5";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-6xO+4eYSp6rlgPT09L7cvlaz6kYYuUPRa3K/TgZmaqE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper which ];
|
||||
buildInputs = [ lwt_react camlzip findlib ];
|
||||
|
||||
propagatedBuildInputs = [ cohttp cohttp-lwt-unix cryptokit hmap ipaddr lwt_log lwt_ssl
|
||||
ocaml_pcre xml-light
|
||||
re xml-light
|
||||
];
|
||||
|
||||
patches = [ ./cohttp-5.patch ];
|
||||
|
||||
configureFlags = [ "--root $(out)" "--prefix /" "--temproot ''" ];
|
||||
|
||||
dontAddPrefix = true;
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ocaml${ocaml.version}-ocsigen-start";
|
||||
version = "6.0.1";
|
||||
version = "6.1.0";
|
||||
|
||||
nativeBuildInputs = [ ocaml findlib eliom ];
|
||||
buildInputs = [ ocsigen-ppx-rpc ];
|
||||
|
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "ocsigen";
|
||||
repo = "ocsigen-start";
|
||||
rev = version;
|
||||
sha256 = "sha256:097bjaxvb1canilmqr8ay3ihig2msq7z8mi0g0rnbciikj1jsrym";
|
||||
hash = "sha256-gHFPutoPYKTDsFninwBTc2WOIFd3+ghRYW2hi1y5MUs=";
|
||||
};
|
||||
|
||||
preInstall = ''
|
||||
|
|
Loading…
Reference in a new issue