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

Merge pull request #67218 from vbgl/ocaml-uri-sexp-3.0.0

Browse Source 
ocamlPackage.cohttp: 2.0.0 -> 2.1.3
This commit is contained in:
Marek Mahut 2019-08-22 16:44:04 +02:00 committed by GitHub
commit 17a2721680
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,22 +1,22 @@
{ lib, fetchFromGitHub, buildDunePackage { lib, fetchFromGitHub, buildDunePackage
, ppx_fields_conv, ppx_sexp_conv , ppx_fields_conv, ppx_sexp_conv
, base64, fieldslib, jsonm, re, stringext, uri , base64, fieldslib, jsonm, re, stringext, uri-sexp
}: }:
buildDunePackage rec { buildDunePackage rec {
pname = "cohttp"; pname = "cohttp";
version = "2.0.0"; version = "2.1.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mirage"; owner = "mirage";
repo = "ocaml-cohttp"; repo = "ocaml-cohttp";
rev = "v${version}"; rev = "v${version}";
sha256 = "0nz9y7l5s9a2rq5sb1m5705h99wvf4dk3fhcgragwhy5nwwzcya8"; sha256 = "16k4ldmz6ljryhr139adlma130frb5wh13qswkrwc5gxx6d2wh8d";
}; };
buildInputs = [ jsonm ppx_fields_conv ppx_sexp_conv ]; buildInputs = [ jsonm ppx_fields_conv ppx_sexp_conv ];
propagatedBuildInputs = [ base64 fieldslib re stringext uri ]; propagatedBuildInputs = [ base64 fieldslib re stringext uri-sexp ];
meta = { meta = {
description = "HTTP(S) library for Lwt, Async and Mirage"; description = "HTTP(S) library for Lwt, Async and Mirage";

6
pkgs/development/ocaml-modules/uri/default.nix
View File

@ -1,5 +1,5 @@
{ lib, fetchurl, buildDunePackage, ppx_sexp_conv, ounit { lib, fetchurl, buildDunePackage, ounit
, re, sexplib0, stringext , re, stringext
}: }:
buildDunePackage rec { buildDunePackage rec {
@ -12,7 +12,7 @@ buildDunePackage rec {
}; };
buildInputs = [ ounit ]; buildInputs = [ ounit ];
propagatedBuildInputs = [ ppx_sexp_conv re sexplib0 stringext ]; propagatedBuildInputs = [ re stringext ];
doCheck = true; doCheck = true;
meta = { meta = {

13
pkgs/development/ocaml-modules/uri/sexp.nix Normal file
View File

@ -0,0 +1,13 @@
{ lib, ocaml, buildDunePackage, uri, ounit, ppx_sexp_conv, sexplib0 }:
if !lib.versionAtLeast ocaml.version "4.04"
then throw "uri-sexp is not available for OCaml ${ocaml.version}"
else
buildDunePackage {
pname = "uri-sexp";
inherit (uri) version src doCheck meta;
buildInputs = [ ounit ];
propagatedBuildInputs = [ ppx_sexp_conv sexplib0 uri ];
}

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

@ -768,6 +768,8 @@ let
then callPackage ../development/ocaml-modules/uri { } then callPackage ../development/ocaml-modules/uri { }
else callPackage ../development/ocaml-modules/uri/legacy.nix { }; else callPackage ../development/ocaml-modules/uri/legacy.nix { };
uri-sexp = callPackage ../development/ocaml-modules/uri/sexp.nix { };
uri_p4 = callPackage ../development/ocaml-modules/uri/legacy.nix { uri_p4 = callPackage ../development/ocaml-modules/uri/legacy.nix {
legacyVersion = true; legacyVersion = true;
}; };