Skip to content
This repository has been archived by the owner on Apr 12, 2021. It is now read-only.

Commit

Permalink
Merge pull request #72171 from romildo/upd.ocamlearlybird
Browse files Browse the repository at this point in the history
ocamlPackages.ocamlearlybird: init at 0.1.5; ocamlPackages.angstrom: 0.10.0 -> 0.12.1
  • Loading branch information
vbgl committed Oct 29, 2019
2 parents 1155bb1 + 432258f commit 5a4e67a
Show file tree
Hide file tree
Showing 6 changed files with 91 additions and 2 deletions.
19 changes: 19 additions & 0 deletions pkgs/development/ocaml-modules/angstrom-async/default.nix
@@ -0,0 +1,19 @@
{ stdenv, fetchFromGitHub, buildDunePackage, angstrom, async }:

buildDunePackage rec {
pname = "angstrom-async";

inherit (angstrom) version src;

minimumOCamlVersion = "4.04.1";

propagatedBuildInputs = [ angstrom async ];

doCheck = true;

meta = {
inherit (angstrom.meta) homepage license;
description = "Async support for Angstrom";
maintainers = with stdenv.lib.maintainers; [ romildo ];
};
}
19 changes: 19 additions & 0 deletions pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix
@@ -0,0 +1,19 @@
{ stdenv, fetchFromGitHub, buildDunePackage, angstrom, ocaml_lwt }:

buildDunePackage rec {
pname = "angstrom-lwt-unix";

inherit (angstrom) version src;

minimumOCamlVersion = "4.03";

propagatedBuildInputs = [ angstrom ocaml_lwt ];

doCheck = true;

meta = {
inherit (angstrom.meta) homepage license;
description = "Lwt_unix support for Angstrom";
maintainers = with stdenv.lib.maintainers; [ romildo ];
};
}
19 changes: 19 additions & 0 deletions pkgs/development/ocaml-modules/angstrom-unix/default.nix
@@ -0,0 +1,19 @@
{ stdenv, fetchFromGitHub, buildDunePackage, angstrom }:

buildDunePackage rec {
pname = "angstrom-unix";

inherit (angstrom) version src;

minimumOCamlVersion = "4.03";

propagatedBuildInputs = [ angstrom ];

doCheck = true;

meta = {
inherit (angstrom.meta) homepage license;
description = "Unix support for Angstrom";
maintainers = with stdenv.lib.maintainers; [ romildo ];
};
}
4 changes: 2 additions & 2 deletions pkgs/development/ocaml-modules/angstrom/default.nix
Expand Up @@ -2,15 +2,15 @@

buildDunePackage rec {
pname = "angstrom";
version = "0.10.0";
version = "0.12.1";

minimumOCamlVersion = "4.03";

src = fetchFromGitHub {
owner = "inhabitedtype";
repo = pname;
rev = version;
sha256 = "0lh6024yf9ds0nh9i93r9m6p5psi8nvrqxl5x7jwl13zb0r9xfpw";
sha256 = "0w0wavqzdy2hrh7cjyl9w72ad4vndhwhknwvyacvkwkja5wys5b2";
};

buildInputs = [ alcotest ];
Expand Down
24 changes: 24 additions & 0 deletions pkgs/development/ocaml-modules/earlybird/default.nix
@@ -0,0 +1,24 @@
{ lib, fetchurl, buildDunePackage, angstrom, angstrom-lwt-unix,
batteries, cmdliner, lwt_ppx, ocaml_lwt, ppx_deriving_yojson,
ppx_tools_versioned, yojson }:

buildDunePackage rec {
pname = "earlybird";
version = "0.1.5";

minimumOCamlVersion = "4.04";

src = fetchurl {
url = "https://github.com/hackwaly/ocamlearlybird/releases/download/${version}/${pname}-${version}.tbz";
sha256 = "10yflmsicw4sdmm075zjpbmxpwm9fvibnl3sl18zjpwnm6l9sv7d";
};

buildInputs = [ angstrom angstrom-lwt-unix batteries cmdliner lwt_ppx ocaml_lwt ppx_deriving_yojson ppx_tools_versioned yojson ];

meta = {
homepage = "https://github.com/hackwaly/ocamlearlybird";
description = "OCaml debug adapter";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.romildo ];
};
}
8 changes: 8 additions & 0 deletions pkgs/top-level/ocaml-packages.nix
Expand Up @@ -20,6 +20,12 @@ let

angstrom = callPackage ../development/ocaml-modules/angstrom { };

angstrom-async = callPackage ../development/ocaml-modules/angstrom-async { };

angstrom-lwt-unix = callPackage ../development/ocaml-modules/angstrom-lwt-unix { };

angstrom-unix = callPackage ../development/ocaml-modules/angstrom-unix { };

ansiterminal = callPackage ../development/ocaml-modules/ansiterminal { };

apron = callPackage ../development/ocaml-modules/apron { };
Expand Down Expand Up @@ -225,6 +231,8 @@ let

earley = callPackage ../development/ocaml-modules/earley { };

earlybird = callPackage ../development/ocaml-modules/earlybird { };

easy-format = callPackage ../development/ocaml-modules/easy-format { };

elina = callPackage ../development/ocaml-modules/elina { };
Expand Down

0 comments on commit 5a4e67a

Please sign in to comment.