Merge remote-tracking branch 'upstream/master' into HEAD

2018-01-01 18:15:13 +01:00
parent e576535408 f448a79770
commit 4cc2a38854
25 changed files with 540 additions and 1167 deletions
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, ocaml, findlib, jbuilder, ounit }:
+
+assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01";
+
+stdenv.mkDerivation rec {
+  pname = "dtoa";
+  name = "ocaml-${pname}-${version}";
+  version = "0.3.1";
+
+  src = fetchurl {
+    url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz";
+    sha256 = "0rzysj07z2q6gk0yhjxnjnba01vmdb9x32wwna10qk3rrb8r2pnn";
+  };
+
+  unpackCmd = "tar xjf $src";
+
+  buildInputs = [ ocaml findlib jbuilder ounit ];
+
+  buildPhase = "jbuilder build -p dtoa";
+
+  inherit (jbuilder) installPhase;
+
+  createFindLibDestdir = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/flowtype/ocaml-dtoa;
+    description = "Converts OCaml floats into strings (doubles to ascii, \"d to a\"), using the efficient Grisu3 algorithm.";
+    license = licenses.mit;
+    platforms = ocaml.meta.platforms or [];
+    maintainers = [ maintainers.eqyiel ];
+  };
+}
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, ocaml, findlib, jbuilder }:
+
+assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01";
+
+stdenv.mkDerivation rec {
+  pname = "wtf8";
+  name = "ocaml-${pname}-${version}";
+  version = "1.0.1";
+
+  src = fetchurl {
+    url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz";
+    sha256 = "1msg3vycd3k8qqj61sc23qks541cxpb97vrnrvrhjnqxsqnh6ygq";
+  };
+
+  unpackCmd = "tar xjf $src";
+
+  buildInputs = [ ocaml findlib jbuilder ];
+
+  buildPhase = "jbuilder build -p wtf8";
+
+  inherit (jbuilder) installPhase;
+
+  createFindLibDestdir = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/flowtype/ocaml-wtf8;
+    description = "WTF-8 is a superset of UTF-8 that allows unpaired surrogates.";
+    license = licenses.mit;
+    platforms = ocaml.meta.platforms or [];
+    maintainers = [ maintainers.eqyiel ];
+  };
+}