git.iko.soy/typeable/nixpkgs
on master help sign in
ocamlPackages.earley: 1.0.2 -> 2.0.0
commit3ca7fc10e851602fd8360446bbece868e4a4a167 authorVincent Laporte <Vincent.Laporte@gmail.com> dateTue 21 May 2019, 22:17 (8 years ago) parent3840e1e
3 files changed+11−52
pkgs/development/ocaml-modules/earley/default.nix+11−20 pkgs/development/ocaml-modules/earley_ocaml/default.nix−30 pkgs/top-level/ocaml-packages.nix−2
pkgs/development/ocaml-modules/earley/default.nix+11−20
@@ -1,28 +1,19 @@
1−{ stdenv, fetchFromGitHub, which, ocaml, findlib, ocamlbuild }:
1+{ lib, fetchurl, buildDunePackage }:
22
3−if !stdenv.lib.versionAtLeast ocaml.version "4.03"
4−then throw "earley is not available for OCaml ${ocaml.version}"
5−else
6−
7−stdenv.mkDerivation rec {
8− version = "1.0.2";
9− name = "ocaml${ocaml.version}-earley-${version}";
10− src = fetchFromGitHub {
11− owner = "rlepigre";
12− repo = "ocaml-earley";
13− rev = "ocaml-earley_${version}";
14− sha256 = "110njakmx1hyq42hyr6gx6qhaxly860whfhd6r0vks4yfp68qvcx";
3+buildDunePackage rec {
4+ version = "2.0.0";
5+ pname = "earley";
6+ src = fetchurl {
7+ url = "https://github.com/rlepigre/ocaml-earley/releases/download/${version}/earley-${version}.tbz";
8+ sha256 = "1kjr0wh3lji7f493kf48rphxnlv3sygj5a8rmx9z3xkpbd7aqyyw";
159 };
1610
17− buildInputs = [ which ocaml findlib ocamlbuild ];
18−
19− createFindlibDestdir = true;
11+ minimumOCamlVersion = "4.03";
2012
2113 meta = {
2214 description = "Parser combinators based on Earley Algorithm";
23− license = stdenv.lib.licenses.cecill-b;
24− maintainers = [ stdenv.lib.maintainers.vbgl ];
25− inherit (ocaml.meta) platforms;
26− inherit (src.meta) homepage;
15+ license = lib.licenses.cecill-b;
16+ maintainers = [ lib.maintainers.vbgl ];
17+ homepage = "https://github.com/rlepigre/ocaml-earley";
2718 };
2819}
pkgs/development/ocaml-modules/earley_ocaml/default.nixdeleted−30
@@ -1,30 +0,0 @@
1−{ stdenv, fetchFromGitHub, which, ocaml, findlib, ocamlbuild, earley }:
2−
3−stdenv.mkDerivation rec {
4− version = "1.0.2";
5− name = "ocaml${ocaml.version}-earley_ocaml-${version}";
6− src = fetchFromGitHub {
7− owner = "rlepigre";
8− repo = "ocaml-earley-ocaml";
9− rev = "ocaml-earley-ocaml_${version}";
10− sha256 = "0f8kr49r2xfs7cbzps4r9i92ckhwssaiydam846jrky3z5djn2jc";
11− };
12−
13− buildInputs = [ which ocaml findlib ocamlbuild ];
14−
15− propagatedBuildInputs = [ earley ];
16−
17− preBuild = "make";
18−
19− createFindlibDestdir = true;
20−
21− installFlags = [ "BINDIR=$(out)/bin" ];
22−
23− meta = {
24− description = "Extensible OCaml parser to be used with Earley";
25− license = stdenv.lib.licenses.cecill-b;
26− maintainers = [ stdenv.lib.maintainers.vbgl ];
27− inherit (ocaml.meta) platforms;
28− inherit (src.meta) homepage;
29− };
30−}
pkgs/top-level/ocaml-packages.nix−2
@@ -217,8 +217,6 @@ let
217217
218218 earley = callPackage ../development/ocaml-modules/earley { };
219219
220− earley_ocaml = callPackage ../development/ocaml-modules/earley_ocaml { };
221−
222220 easy-format = callPackage ../development/ocaml-modules/easy-format { };
223221
224222 elina = callPackage ../development/ocaml-modules/elina { };