Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add OCaml libraries: psq, lru, faraday, farfadet, digestif #32585

Merged
merged 5 commits into from
Dec 23, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
29 changes: 29 additions & 0 deletions pkgs/development/ocaml-modules/digestif/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg }:

if !stdenv.lib.versionAtLeast ocaml.version "4.3"
then throw "digestif is not available for OCaml ${ocaml.version}"
else

stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-digestif-${version}";
version = "0.5";

src = fetchurl {
url = "https://github.com/mirage/digestif/releases/download/v${version}/digestif-${version}.tbz";
sha256 = "0fsyfi5ps17j3wjav5176gf6z3a5xcw9aqhcr1gml9n9ayfbkhrd";
};

unpackCmd = "tar -xjf $curSrc";

buildInputs = [ ocaml findlib ocamlbuild topkg ];

inherit (topkg) buildPhase installPhase;

meta = {
description = "Simple hash algorithms in OCaml";
homepage = "https://github.com/mirage/digestif";
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.vbgl ];
inherit (ocaml.meta) platforms;
};
}
34 changes: 34 additions & 0 deletions pkgs/development/ocaml-modules/faraday/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, alcotest }:

if !stdenv.lib.versionAtLeast ocaml.version "4.02"
then throw "faraday is not available for OCaml ${ocaml.version}"
else

stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-faraday-${version}";
version = "0.5.0";

src = fetchFromGitHub {
owner = "inhabitedtype";
repo = "faraday";
rev = version;
sha256 = "1kql0il1frsbx6rvwqd7ahi4m14ik6la5an6c2w4x7k00ndm4d7n";
};

buildInputs = [ ocaml findlib jbuilder alcotest ];

buildPhase = "jbuilder build -p faraday";

doCheck = true;
checkPhase = "jbuilder runtest";

inherit (jbuilder) installPhase;

meta = {
description = "Serialization library built for speed and memory efficiency";
license = stdenv.lib.licenses.bsd3;
maintainers = [ stdenv.lib.maintainers.vbgl ];
inherit (src.meta) homepage;
inherit (ocaml.meta) platforms;
};
}
34 changes: 34 additions & 0 deletions pkgs/development/ocaml-modules/farfadet/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg
, faraday
}:

if !stdenv.lib.versionAtLeast ocaml.version "4.3"
then throw "farfadet is not available for OCaml ${ocaml.version}"
else

stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-farfadet-${version}";
version = "0.2";

src = fetchurl {
url = "https://github.com/oklm-wsh/Farfadet/releases/download/v${version}/farfadet-${version}.tbz";
sha256 = "06wvd57c8khpq0c2hvm15zng269zvabsw1lcaqphqdcckl67nsxr";
};

unpackCmd = "tar -xjf $curSrc";

buildInputs = [ ocaml findlib ocamlbuild topkg ];

propagatedBuildInputs = [ faraday ];

inherit (topkg) buildPhase installPhase;

meta = {
description = "A printf-like for Faraday library";
homepage = "https://github.com/oklm-wsh/Farfadet";
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.vbgl ];
inherit (ocaml.meta) platforms;
};
}

27 changes: 27 additions & 0 deletions pkgs/development/ocaml-modules/lru/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, psq }:

stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-lru-${version}";
version = "0.2.0";

src = fetchurl {
url = "https://github.com/pqwy/lru/releases/download/v${version}/lru-${version}.tbz";
sha256 = "0bd7js9rrma1fjjjjc3fgr9l5fjbhgihx2nsaf96g2b35iiaimd0";
};

unpackCmd = "tar -xjf $curSrc";

buildInputs = [ ocaml findlib ocamlbuild topkg ];

propagatedBuildInputs = [ psq ];

inherit (topkg) buildPhase installPhase;

meta = {
homepage = "https://github.com/pqwy/lru";
description = "Scalable LRU caches for OCaml";
maintainers = [ stdenv.lib.maintainers.vbgl ];
license = stdenv.lib.licenses.isc;
inherit (ocaml.meta) platforms;
};
}
29 changes: 29 additions & 0 deletions pkgs/development/ocaml-modules/psq/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg }:

if !stdenv.lib.versionAtLeast ocaml.version "4.02"
then throw "psq is not available for OCaml ${ocaml.version}"
else

stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-psq-${version}";
version = "0.1.0";

src = fetchurl {
url = "https://github.com/pqwy/psq/releases/download/v${version}/psq-${version}.tbz";
sha256 = "08ghgdivbjrxnaqc3hsb69mr9s2ql5ds0fb97b7z6zimzqibz6lp";
};

unpackCmd = "tar -xjf $curSrc";

buildInputs = [ ocaml findlib ocamlbuild topkg ];

inherit (topkg) buildPhase installPhase;

meta = {
description = "Functional Priority Search Queues for OCaml";
homepage = "https://github.com/pqwy/psq";
maintainers = [ stdenv.lib.maintainers.vbgl ];
license = stdenv.lib.licenses.isc;
inherit (ocaml.meta) platforms;
};
}
10 changes: 10 additions & 0 deletions pkgs/top-level/ocaml-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,8 @@ let

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

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

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

dolog = callPackage ../development/ocaml-modules/dolog { };
Expand Down Expand Up @@ -231,6 +233,10 @@ let

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

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

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

fieldslib_p4 = callPackage ../development/ocaml-modules/fieldslib { };

fileutils = callPackage ../development/ocaml-modules/fileutils { };
Expand Down Expand Up @@ -349,6 +355,8 @@ let
lwt = ocaml_lwt;
};

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

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

lwt3 = if lib.versionOlder "4.02" ocaml.version
Expand Down Expand Up @@ -500,6 +508,8 @@ let
piqi = callPackage ../development/ocaml-modules/piqi { };
piqi-ocaml = callPackage ../development/ocaml-modules/piqi-ocaml { };

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

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

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