Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 875b1f09d4ba
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ff392e81901c
Choose a head ref
  • 1 commit
  • 4 files changed
  • 1 contributor

Commits on Sep 3, 2019

  1. ocamlPackages.ocplib-json-typed: 0.5 -> 0.7.1

    @vbgl
    vbgl committed Sep 3, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ff392e8 View commit details
14 changes: 14 additions & 0 deletions pkgs/development/ocaml-modules/ocplib-json-typed/browser.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
};
}

13 changes: 13 additions & 0 deletions pkgs/development/ocaml-modules/ocplib-json-typed/bson.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
};
}
18 changes: 7 additions & 11 deletions pkgs/development/ocaml-modules/ocplib-json-typed/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
};
}
4 changes: 4 additions & 0 deletions pkgs/top-level/ocaml-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -553,6 +553,10 @@ let

ocplib-json-typed = callPackage ../development/ocaml-modules/ocplib-json-typed { };

ocplib-json-typed-browser = callPackage ../development/ocaml-modules/ocplib-json-typed/browser.nix { };

ocplib-json-typed-bson = callPackage ../development/ocaml-modules/ocplib-json-typed/bson.nix { };

ocplib-simplex = callPackage ../development/ocaml-modules/ocplib-simplex { };

ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { };