git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #72171 from romildo/upd.ocamlearlybird

ocamlPackages.ocamlearlybird: init at 0.1.5; ocamlPackages.angstrom: 0.10.0 -> 0.12.1

commit5a4e67ad0384791bf45ed12f33c75fc79d9eaf16 authorVincent Laporte <vbgl@users.noreply.github.com> dateTue 29 Oct 2019, 14:31 (7 years ago) parent1155bb1432258f
6 files changed+91−2
pkgs/development/ocaml-modules/angstrom-async/default.nix+19 pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix+19 pkgs/development/ocaml-modules/angstrom-unix/default.nix+19 pkgs/development/ocaml-modules/angstrom/default.nix+2−2 pkgs/development/ocaml-modules/earlybird/default.nix+24 pkgs/top-level/ocaml-packages.nix+8
pkgs/development/ocaml-modules/angstrom-async/default.nixnew file+19
@@ -0,0 +1,19 @@
1+{ stdenv, fetchFromGitHub, buildDunePackage, angstrom, async }:
2+
3+buildDunePackage rec {
4+ pname = "angstrom-async";
5+
6+ inherit (angstrom) version src;
7+
8+ minimumOCamlVersion = "4.04.1";
9+
10+ propagatedBuildInputs = [ angstrom async ];
11+
12+ doCheck = true;
13+
14+ meta = {
15+ inherit (angstrom.meta) homepage license;
16+ description = "Async support for Angstrom";
17+ maintainers = with stdenv.lib.maintainers; [ romildo ];
18+ };
19+}
pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nixnew file+19
@@ -0,0 +1,19 @@
1+{ stdenv, fetchFromGitHub, buildDunePackage, angstrom, ocaml_lwt }:
2+
3+buildDunePackage rec {
4+ pname = "angstrom-lwt-unix";
5+
6+ inherit (angstrom) version src;
7+
8+ minimumOCamlVersion = "4.03";
9+
10+ propagatedBuildInputs = [ angstrom ocaml_lwt ];
11+
12+ doCheck = true;
13+
14+ meta = {
15+ inherit (angstrom.meta) homepage license;
16+ description = "Lwt_unix support for Angstrom";
17+ maintainers = with stdenv.lib.maintainers; [ romildo ];
18+ };
19+}
pkgs/development/ocaml-modules/angstrom-unix/default.nixnew file+19
@@ -0,0 +1,19 @@
1+{ stdenv, fetchFromGitHub, buildDunePackage, angstrom }:
2+
3+buildDunePackage rec {
4+ pname = "angstrom-unix";
5+
6+ inherit (angstrom) version src;
7+
8+ minimumOCamlVersion = "4.03";
9+
10+ propagatedBuildInputs = [ angstrom ];
11+
12+ doCheck = true;
13+
14+ meta = {
15+ inherit (angstrom.meta) homepage license;
16+ description = "Unix support for Angstrom";
17+ maintainers = with stdenv.lib.maintainers; [ romildo ];
18+ };
19+}
pkgs/development/ocaml-modules/angstrom/default.nix+2−2
@@ -2,7 +2,7 @@
22
33buildDunePackage rec {
44 pname = "angstrom";
5− version = "0.10.0";
5+ version = "0.12.1";
66
77 minimumOCamlVersion = "4.03";
88
@@ -10,7 +10,7 @@ buildDunePackage rec {
1010 owner = "inhabitedtype";
1111 repo = pname;
1212 rev = version;
13− sha256 = "0lh6024yf9ds0nh9i93r9m6p5psi8nvrqxl5x7jwl13zb0r9xfpw";
13+ sha256 = "0w0wavqzdy2hrh7cjyl9w72ad4vndhwhknwvyacvkwkja5wys5b2";
1414 };
1515
1616 buildInputs = [ alcotest ];
pkgs/development/ocaml-modules/earlybird/default.nixnew file+24
@@ -0,0 +1,24 @@
1+{ lib, fetchurl, buildDunePackage, angstrom, angstrom-lwt-unix,
2+ batteries, cmdliner, lwt_ppx, ocaml_lwt, ppx_deriving_yojson,
3+ ppx_tools_versioned, yojson }:
4+
5+buildDunePackage rec {
6+ pname = "earlybird";
7+ version = "0.1.5";
8+
9+ minimumOCamlVersion = "4.04";
10+
11+ src = fetchurl {
12+ url = "https://github.com/hackwaly/ocamlearlybird/releases/download/${version}/${pname}-${version}.tbz";
13+ sha256 = "10yflmsicw4sdmm075zjpbmxpwm9fvibnl3sl18zjpwnm6l9sv7d";
14+ };
15+
16+ buildInputs = [ angstrom angstrom-lwt-unix batteries cmdliner lwt_ppx ocaml_lwt ppx_deriving_yojson ppx_tools_versioned yojson ];
17+
18+ meta = {
19+ homepage = "https://github.com/hackwaly/ocamlearlybird";
20+ description = "OCaml debug adapter";
21+ license = lib.licenses.mit;
22+ maintainers = [ lib.maintainers.romildo ];
23+ };
24+}
pkgs/top-level/ocaml-packages.nix+8
@@ -20,6 +20,12 @@ let
2020
2121 angstrom = callPackage ../development/ocaml-modules/angstrom { };
2222
23+ angstrom-async = callPackage ../development/ocaml-modules/angstrom-async { };
24+
25+ angstrom-lwt-unix = callPackage ../development/ocaml-modules/angstrom-lwt-unix { };
26+
27+ angstrom-unix = callPackage ../development/ocaml-modules/angstrom-unix { };
28+
2329 ansiterminal = callPackage ../development/ocaml-modules/ansiterminal { };
2430
2531 apron = callPackage ../development/ocaml-modules/apron { };
@@ -225,6 +231,8 @@ let
225231
226232 earley = callPackage ../development/ocaml-modules/earley { };
227233
234+ earlybird = callPackage ../development/ocaml-modules/earlybird { };
235+
228236 easy-format = callPackage ../development/ocaml-modules/easy-format { };
229237
230238 elina = callPackage ../development/ocaml-modules/elina { };