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

ocamlPackages.cohttp: 1.1.1 -> 2.0.0

Browse Source
This commit is contained in:
Vincent Laporte 2019-04-06 13:54:37 +00:00
parent 905405eb72
commit 2dfc7524c6
No known key found for this signature in database
GPG Key ID: EBD582ADDDB1F81F
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,27 +1,27 @@
{ stdenv, fetchFromGitHub, buildDunePackage { lib, fetchFromGitHub, buildDunePackage
, ppx_fields_conv, ppx_sexp_conv, ppx_deriving , ppx_fields_conv, ppx_sexp_conv, ppx_deriving
, base64, fieldslib, jsonm, re, stringext, uri , base64, fieldslib, jsonm, re, stringext, uri
}: }:
buildDunePackage rec { buildDunePackage rec {
pname = "cohttp"; pname = "cohttp";
version = "1.1.1"; version = "2.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mirage"; owner = "mirage";
repo = "ocaml-cohttp"; repo = "ocaml-cohttp";
rev = "v${version}"; rev = "v${version}";
sha256 = "1dzd6vy43b7p9xplzg2whylz5br59zxaqywa14b4l377f31gnwq1"; sha256 = "0nz9y7l5s9a2rq5sb1m5705h99wvf4dk3fhcgragwhy5nwwzcya8";
}; };
buildInputs = [ jsonm ppx_fields_conv ppx_sexp_conv ]; buildInputs = [ jsonm ppx_fields_conv ppx_sexp_conv ];
propagatedBuildInputs = [ ppx_deriving base64 fieldslib re stringext uri ]; propagatedBuildInputs = [ base64 fieldslib re stringext uri ];
meta = { meta = {
description = "HTTP(S) library for Lwt, Async and Mirage"; description = "HTTP(S) library for Lwt, Async and Mirage";
license = stdenv.lib.licenses.isc; license = lib.licenses.isc;
maintainers = [ stdenv.lib.maintainers.vbgl ]; maintainers = [ lib.maintainers.vbgl ];
inherit (src.meta) homepage; inherit (src.meta) homepage;
}; };
} }

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

@ -1,4 +1,4 @@
{ stdenv, buildDunePackage, cohttp, ocaml_lwt, uri, ppx_sexp_conv }: { stdenv, buildDunePackage, cohttp, ocaml_lwt, uri, ppx_sexp_conv, logs }:
if !stdenv.lib.versionAtLeast cohttp.version "0.99" if !stdenv.lib.versionAtLeast cohttp.version "0.99"
then cohttp then cohttp
@ -10,5 +10,5 @@ buildDunePackage rec {
buildInputs = [ uri ppx_sexp_conv ]; buildInputs = [ uri ppx_sexp_conv ];
propagatedBuildInputs = [ cohttp ocaml_lwt ]; propagatedBuildInputs = [ cohttp ocaml_lwt logs ];
} }

4
pkgs/top-level/ocaml-packages.nix
View File

@ -153,9 +153,7 @@ let
cohttp = cohttp =
if lib.versionOlder "4.03" ocaml.version if lib.versionOlder "4.03" ocaml.version
then callPackage ../development/ocaml-modules/cohttp { then callPackage ../development/ocaml-modules/cohttp { }
base64 = base64_2;
}
else cohttp_p4; else cohttp_p4;
cohttp-lwt = callPackage ../development/ocaml-modules/cohttp/lwt.nix { }; cohttp-lwt = callPackage ../development/ocaml-modules/cohttp/lwt.nix { };