Merge branch 'master' into staging-next

This commit is contained in:
Vladimír Čunát
2019-09-04 11:00:56 +02:00
217 changed files with 7332 additions and 2071 deletions

View File

@@ -0,0 +1,14 @@
{ buildDunePackage, ocplib-json-typed, js_of_ocaml }:
buildDunePackage {
pname = "ocplib-json-typed-browser";
inherit (ocplib-json-typed) version src;
propagatedBuildInputs = [ ocplib-json-typed js_of_ocaml ];
meta = {
description = "A Json_repr interface over JavaScript's objects";
inherit (ocplib-json-typed.meta) homepage license maintainers;
};
}

View File

@@ -0,0 +1,13 @@
{ buildDunePackage, ocplib-json-typed, ocplib-endian }:
buildDunePackage {
pname = "ocplib-json-typed-bson";
inherit (ocplib-json-typed) version src;
propagatedBuildInputs = [ ocplib-json-typed ocplib-endian ];
meta = {
description = "A Json_repr compatible implementation of the JSON compatible subset of BSON";
inherit (ocplib-json-typed.meta) homepage license maintainers;
};
}

View File

@@ -1,25 +1,21 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, ocplib-endian, js_of_ocaml, uri }:
{ lib, buildDunePackage, fetchFromGitHub, uri }:
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-ocplib-json-typed-${version}";
version = "0.5";
buildDunePackage rec {
pname = "ocplib-json-typed";
version = "0.7.1";
src = fetchFromGitHub {
owner = "OCamlPro";
repo = "ocplib-json-typed";
rev = "v${version}";
sha256 = "02c600wm2wdpzb66pivxzwjhqa2dm7dqyfvw3mbvkv1g2jj7kn2q";
sha256 = "1gv0vqqy9lh7isaqg54b3lam2sh7nfjjazi6x7zn6bh5f77g1p5q";
};
buildInputs = [ ocaml findlib ocplib-endian js_of_ocaml ];
propagatedBuildInputs = [ uri ];
createFindlibDestdir = true;
meta = {
description = "A collection of type-aware JSON utilities for OCaml";
license = stdenv.lib.licenses.lgpl21;
maintainers = [ stdenv.lib.maintainers.vbgl ];
license = lib.licenses.lgpl21;
maintainers = [ lib.maintainers.vbgl ];
inherit (src.meta) homepage;
inherit (ocaml.meta) platforms;
};
}