Revert "ocaml-modules: fix naming: "_" -> "-""

This commit is contained in:
ts468
2015-09-06 21:15:10 +02:00
parent a9dab9df61
commit 054be41e04
36 changed files with 130 additions and 156 deletions

View File

@@ -1,5 +1,5 @@
{stdenv, buildOcaml, fetchurl, async-kernel,
async-unix, async-extra, pa-ounit}:
{stdenv, buildOcaml, fetchurl, async_kernel,
async_unix, async_extra, pa_ounit}:
buildOcaml rec {
name = "async";
@@ -12,7 +12,7 @@ buildOcaml rec {
sha256 = "ecc4ca939ab098e689332921b110dbaacd06d9f8d8bf697023dfff3ca37dc1e9";
};
propagatedBuildInputs = [ async-kernel async-unix async-extra pa-ounit ];
propagatedBuildInputs = [ async_kernel async_unix async_extra pa_ounit ];
meta = with stdenv.lib; {
homepage = https://github.com/janestreet/async;

View File

@@ -1,9 +1,9 @@
{stdenv, buildOcaml, fetchurl, async-kernel, async-unix,
bin-prot, core, custom-printf, fieldslib, herelib, pa-ounit,
pipebang, pa-test, sexplib}:
{stdenv, buildOcaml, fetchurl, async_kernel, async_unix,
bin_prot, core, custom_printf, fieldslib, herelib, pa_ounit,
pipebang, pa_test, sexplib}:
buildOcaml rec {
name = "async-extra";
name = "async_extra";
version = "112.24.00";
minimumSupportedOcamlVersion = "4.02";
@@ -13,8 +13,8 @@ buildOcaml rec {
sha256 = "51f6f67a9ad56fe5dcf09faeeca6ec2fea53a7a975a72bc80504b90841212e28";
};
buildInputs = [ pa-test pa-ounit ];
propagatedBuildInputs = [ async-kernel async-unix core bin-prot custom-printf
buildInputs = [ pa_test pa_ounit ];
propagatedBuildInputs = [ async_kernel async_unix core bin_prot custom_printf
fieldslib herelib pipebang sexplib ];
meta = with stdenv.lib; {

View File

@@ -1,7 +1,7 @@
{stdenv, buildOcaml, fetchurl, async, core, sexplib}:
buildOcaml rec {
name = "async-find";
name = "async_find";
version = "111.28.00";
minimumSupportedOcamlVersion = "4.02";

View File

@@ -1,9 +1,9 @@
{stdenv, buildOcaml, fetchurl, core-kernel,
bin-prot, fieldslib, pa-ounit, pa-test,
{stdenv, buildOcaml, fetchurl, core_kernel,
bin_prot, fieldslib, pa_ounit, pa_test,
sexplib, herelib}:
buildOcaml rec {
name = "async-kernel";
name = "async_kernel";
version = "112.24.00";
minimumSupportedOcamlVersion = "4.02";
@@ -13,8 +13,8 @@ buildOcaml rec {
sha256 = "95caf4249b55c5a6b38da56e314845e9ea9a0876eedd4cf0ddcb6c8dd660c6a0";
};
buildInputs = [ pa-test pa-ounit ];
propagatedBuildInputs = [ core-kernel bin-prot fieldslib herelib sexplib ];
buildInputs = [ pa_test pa_ounit ];
propagatedBuildInputs = [ core_kernel bin_prot fieldslib herelib sexplib ];
meta = with stdenv.lib; {
homepage = https://github.com/janestreet/async_kernel;

View File

@@ -1,7 +1,7 @@
{stdenv, buildOcaml, fetchurl, async, core, core-extended}:
{stdenv, buildOcaml, fetchurl, async, core, core_extended}:
buildOcaml rec {
name = "async-shell";
name = "async_shell";
version = "109.28.03";
minimumSupportedOcamlVersion = "4.02";
@@ -11,7 +11,7 @@ buildOcaml rec {
sha256 = "0b4497bea9124c5a665ee58fb0a73c5cbf2f757479df902e6870627196e6c105";
};
propagatedBuildInputs = [ async core core-extended ];
propagatedBuildInputs = [ async core core_extended ];
meta = with stdenv.lib; {
homepage = https://github.com/janestreet/async_shell;

View File

@@ -1,5 +1,5 @@
{stdenv, buildOcaml, fetchurl, async, comparelib, core, ctypes, openssl,
fieldslib, herelib, pa-bench, pa-ounit, pipebang, pa-test, sexplib}:
fieldslib, herelib, pa_bench, pa_ounit, pipebang, pa_test, sexplib}:
buildOcaml rec {
name = "async_ssl";
@@ -12,8 +12,8 @@ buildOcaml rec {
sha256 = "1b0bea92142eef11da6bf649bbe229bd4b8d9cc807303d8142406908c0d28c68";
};
buildInputs = [ pa-bench pa-test ];
propagatedBuildInputs = [ ctypes async comparelib core fieldslib pa-ounit
buildInputs = [ pa_bench pa_test ];
propagatedBuildInputs = [ ctypes async comparelib core fieldslib pa_ounit
herelib pipebang sexplib openssl ];
meta = with stdenv.lib; {

View File

@@ -1,9 +1,9 @@
{stdenv, buildOcaml, fetchurl, async-kernel,
bin-prot, comparelib, core, fieldslib, herelib, pa-ounit,
pipebang, pa-test, sexplib}:
{stdenv, buildOcaml, fetchurl, async_kernel,
bin_prot, comparelib, core, fieldslib, herelib, pa_ounit,
pipebang, pa_test, sexplib}:
buildOcaml rec {
name = "async-unix";
name = "async_unix";
version = "112.24.00";
minimumSupportedOcamlVersion = "4.02";
@@ -14,9 +14,9 @@ buildOcaml rec {
};
hasSharedObjects = true;
buildInputs = [ pa-ounit ];
propagatedBuildInputs = [ async-kernel core bin-prot comparelib
fieldslib herelib pipebang pa-test sexplib ];
buildInputs = [ pa_ounit ];
propagatedBuildInputs = [ async_kernel core bin_prot comparelib
fieldslib herelib pipebang pa_test sexplib ];
meta = with stdenv.lib; {
homepage = https://github.com/janestreet/async_unix;

View File

@@ -1,7 +1,7 @@
{stdenv, writeText, buildOcaml, fetchurl, type-conv}:
{stdenv, writeText, buildOcaml, fetchurl, type_conv}:
buildOcaml rec {
name = "bin-prot";
name = "bin_prot";
version = "112.24.00";
minimumSupportedOcamlVersion = "4.00";
@@ -11,7 +11,7 @@ buildOcaml rec {
sha256 = "dc0c978a825c7c123990af3317637c218f61079e6f35dc878260651084f1adb4";
};
propagatedBuildInputs = [ type-conv ];
propagatedBuildInputs = [ type_conv ];
hasSharedObjects = true;

View File

@@ -1,6 +1,6 @@
{stdenv, buildOcaml, fetchurl, cmdliner, re, uri, fieldslib, sexplib, conduit,
stringext, base64, magic-mime, ounit, alcotest, lwt ? null,
async ? null, async-ssl ? null}:
async ? null, async_ssl ? null}:
buildOcaml rec {
name = "cohttp";
@@ -16,7 +16,7 @@ buildOcaml rec {
buildInputs = [ alcotest ];
propagatedBuildInputs = [ cmdliner re uri fieldslib sexplib sexplib
conduit stringext base64 magic-mime ounit async
async-ssl lwt ];
async_ssl lwt ];
buildFlags = "PREFIX=$(out)";

View File

@@ -1,4 +1,4 @@
{stdenv, buildOcaml, fetchurl, type-conv}:
{stdenv, buildOcaml, fetchurl, type_conv}:
buildOcaml rec {
name = "comparelib";
@@ -11,7 +11,7 @@ buildOcaml rec {
sha256 = "1075fb05e0d1e290f71ad0f6163f32b2cb4cebdc77568491c7eb38ba91f5db7e";
};
propagatedBuildInputs = [ type-conv ];
propagatedBuildInputs = [ type_conv ];
meta = with stdenv.lib; {
homepage = https://github.com/janestreet/comparelib;

View File

@@ -1,5 +1,5 @@
{stdenv, buildOcaml, fetchurl, sexplib, stringext, uri, cstruct, ipaddr,
async ? null, async-ssl ? null, lwt ? null}:
async ? null, async_ssl ? null, lwt ? null}:
buildOcaml rec {
name = "conduit";
@@ -13,7 +13,7 @@ buildOcaml rec {
propagatedBuildInputs = ([ sexplib stringext uri cstruct ipaddr ]
++ stdenv.lib.optional (lwt != null) lwt
++ stdenv.lib.optional (async != null) async
++ stdenv.lib.optional (async-ssl != null) async-ssl);
++ stdenv.lib.optional (async_ssl != null) async_ssl);
meta = with stdenv.lib; {
homepage = https://github.com/mirage/ocaml-conduit;

View File

@@ -1,6 +1,6 @@
{stdenv, buildOcaml, fetchurl, type-conv,
core-kernel, bin-prot, comparelib, custom-printf, enumerate,
fieldslib, herelib, pa-bench, pa-test, pa-ounit,
{stdenv, buildOcaml, fetchurl, type_conv,
core_kernel, bin_prot, comparelib, custom_printf, enumerate,
fieldslib, herelib, pa_bench, pa_test, pa_ounit,
pipebang, sexplib, typerep, variantslib}:
buildOcaml rec {
@@ -16,9 +16,9 @@ buildOcaml rec {
hasSharedObjects = true;
buildInputs = [ pa-bench pa-test pa-ounit ];
propagatedBuildInputs = [ type-conv core-kernel bin-prot comparelib
custom-printf enumerate fieldslib herelib
buildInputs = [ pa_bench pa_test pa_ounit ];
propagatedBuildInputs = [ type_conv core_kernel bin_prot comparelib
custom_printf enumerate fieldslib herelib
pipebang sexplib typerep variantslib ];
meta = with stdenv.lib; {

View File

@@ -1,8 +1,8 @@
{stdenv, buildOcaml, fetchurl, bin-prot, comparelib, core, custom-printf,
fieldslib, pa-bench, pa-ounit, pipebang, pa-test, textutils, re2, sexplib}:
{stdenv, buildOcaml, fetchurl, bin_prot, comparelib, core, custom_printf,
fieldslib, pa_bench, pa_ounit, pipebang, pa_test, textutils, re2, sexplib}:
buildOcaml rec {
name = "core-extended";
name = "core_extended";
version = "112.24.00";
minimumSupportedOcamlVersion = "4.02";
@@ -13,8 +13,8 @@ buildOcaml rec {
};
hasSharedObjects = true;
buildInputs = [ pa-bench pa-test pa-ounit ];
propagatedBuildInputs = [bin-prot comparelib core custom-printf fieldslib
buildInputs = [ pa_bench pa_test pa_ounit ];
propagatedBuildInputs = [bin_prot comparelib core custom_printf fieldslib
pipebang textutils re2 sexplib ];
meta = with stdenv.lib; {

View File

@@ -1,10 +1,10 @@
{stdenv, buildOcaml, fetchurl, type-conv,
bin-prot, comparelib, custom-printf, enumerate,
fieldslib, herelib, pa-bench, pa-test, pa-ounit,
{stdenv, buildOcaml, fetchurl, type_conv,
bin_prot, comparelib, custom_printf, enumerate,
fieldslib, herelib, pa_bench, pa_test, pa_ounit,
pipebang, sexplib, typerep, variantslib}:
buildOcaml rec {
name = "core-kernel";
name = "core_kernel";
version = "112.24.00";
minimumSupportedOcamlVersion = "4.02";
@@ -16,8 +16,8 @@ buildOcaml rec {
hasSharedObjects = true;
buildInputs = [ pa-test pa-ounit ];
propagatedBuildInputs = [ type-conv pa-bench bin-prot comparelib custom-printf
buildInputs = [ pa_test pa_ounit ];
propagatedBuildInputs = [ type_conv pa_bench bin_prot comparelib custom_printf
enumerate fieldslib herelib pipebang sexplib
typerep variantslib ];

View File

@@ -1,7 +1,7 @@
{stdenv, buildOcaml, fetchurl, type-conv, sexplib, pa-ounit}:
{stdenv, buildOcaml, fetchurl, type_conv, sexplib, pa_ounit}:
buildOcaml rec {
name = "custom-printf";
name = "custom_printf";
version = "112.24.00";
minimumSupportedOcamlVersion = "4.02";
@@ -11,8 +11,8 @@ buildOcaml rec {
sha256 = "dad3aface92c53e8fbcc12cc9358c4767cb1cb09857d4819a10ed98eccaca8f9";
};
buildInputs = [ pa-ounit ];
propagatedBuildInputs = [ type-conv sexplib ];
buildInputs = [ pa_ounit ];
propagatedBuildInputs = [ type_conv sexplib ];
meta = with stdenv.lib; {
homepage = https://github.com/janestreet/custom_printf;

View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, ocaml, findlib, type-conv, camlp4 }:
{ stdenv, fetchurl, ocaml, findlib, type_conv, camlp4 }:
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
};
buildInputs = [ ocaml findlib ];
propagatedBuildInputs = [ type-conv camlp4 ];
propagatedBuildInputs = [ type_conv camlp4 ];
createFindlibDestdir = true;

View File

@@ -3,7 +3,7 @@
let version = "0.3"; in
stdenv.mkDerivation {
name = "ocaml-erm-xml-${version}";
name = "ocaml-erm_xml-${version}";
src = fetchzip {
url = "https://github.com/ermine/xml/archive/v${version}.tar.gz";

View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchzip, ocaml, findlib, erm-xml, cryptokit, camlp4 }:
{ stdenv, fetchurl, fetchzip, ocaml, findlib, erm_xml, cryptokit, camlp4 }:
let
version = "0.2";
@@ -9,7 +9,7 @@ let
in
stdenv.mkDerivation {
name = "ocaml-erm-xmpp-${version}";
name = "ocaml-erm_xmpp-${version}";
src = fetchzip {
url = "https://github.com/ermine/xmpp/archive/v${version}.tar.gz";
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
patches = [ disable-tests ];
buildInputs = [ ocaml findlib camlp4 ];
propagatedBuildInputs = [ erm-xml cryptokit ];
propagatedBuildInputs = [ erm_xml cryptokit ];
createFindlibDestdir = true;

View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, ocaml, findlib, type-conv, camlp4 }:
{ stdenv, fetchurl, ocaml, findlib, type_conv, camlp4 }:
assert stdenv.lib.versionOlder "4.00" (stdenv.lib.getVersion ocaml);
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
};
buildInputs = [ ocaml findlib ];
propagatedBuildInputs = [ type-conv camlp4 ];
propagatedBuildInputs = [ type_conv camlp4 ];
createFindlibDestdir = true;

View File

@@ -1,4 +1,4 @@
{stdenv, fetchurl, ocaml, findlib, type-conv, ounit, camlp4}:
{stdenv, fetchurl, ocaml, findlib, type_conv, ounit, camlp4}:
stdenv.mkDerivation {
name = "ocaml-data-notation-0.0.11";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "09a8zdyifpc2nl4hdvg9206142y31cq95ajgij011s1qcg3z93lj";
};
buildInputs = [ocaml findlib type-conv ounit camlp4];
buildInputs = [ocaml findlib type_conv ounit camlp4];
createFindlibDestdir = true;

View File

@@ -1,7 +1,7 @@
{stdenv, buildOcaml, fetchurl, type-conv, pa-ounit}:
{stdenv, buildOcaml, fetchurl, type_conv, pa_ounit}:
buildOcaml rec {
name = "pa-bench";
name = "pa_bench";
version = "112.06.00";
minimumSupportedOcamlVersion = "4.00";
@@ -11,8 +11,8 @@ buildOcaml rec {
sha256 = "e3401e37f1d3d4acb957fd46a192d0ffcefeb0bedee63bbeb26969af1d540870";
};
buildInputs = [ pa-ounit ];
propagatedBuildInputs = [ type-conv ];
buildInputs = [ pa_ounit ];
propagatedBuildInputs = [ type_conv ];
meta = with stdenv.lib; {
homepage = https://github.com/janestreet/pa_bench;

View File

@@ -1,7 +1,7 @@
{stdenv, buildOcaml, fetchurl, ounit}:
buildOcaml rec {
name = "pa-ounit";
name = "pa_ounit";
version = "112.24.00";
src = fetchurl {

View File

@@ -1,7 +1,7 @@
{stdenv, buildOcaml, fetchurl, type-conv, pa-ounit, sexplib, herelib}:
{stdenv, buildOcaml, fetchurl, type_conv, pa_ounit, sexplib, herelib}:
buildOcaml rec {
name = "pa-test";
name = "pa_test";
version = "112.24.00";
minimumSupportedOcamlVersion = "4.00";
@@ -11,8 +11,8 @@ buildOcaml rec {
sha256 = "b03d13c2bc9fa9a4b1c507d7108d965202160f83e9781d430d3b53a1993e30d6";
};
buildInputs = [ pa-ounit ];
propagatedBuildInputs = [ type-conv sexplib herelib ];
buildInputs = [ pa_ounit ];
propagatedBuildInputs = [ type_conv sexplib herelib ];
meta = with stdenv.lib; {
homepage = https://github.com/janestreet/pa_test;

View File

@@ -1,5 +1,5 @@
{stdenv, buildOcaml, fetchurl, ocaml, core, pa-ounit, pa-test,
bin-prot, comparelib, sexplib, rsync}:
{stdenv, buildOcaml, fetchurl, ocaml, core, pa_ounit, pa_test,
bin_prot, comparelib, sexplib, rsync}:
buildOcaml rec {
name = "re2";
@@ -15,8 +15,8 @@ buildOcaml rec {
then [./Makefile.patch ./myocamlbuild.patch]
else null;
buildInputs = [ pa-ounit pa-test rsync ];
propagatedBuildInputs = [ core bin-prot comparelib sexplib ];
buildInputs = [ pa_ounit pa_test rsync ];
propagatedBuildInputs = [ core bin_prot comparelib sexplib ];
hasSharedObjects = true;

View File

@@ -1,4 +1,4 @@
{stdenv, fetchurl, ocaml, findlib, type-conv, camlp4}:
{stdenv, fetchurl, ocaml, findlib, type_conv, camlp4}:
let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
};
buildInputs = [ocaml findlib];
propagatedBuildInputs = [type-conv camlp4];
propagatedBuildInputs = [type_conv camlp4];
createFindlibDestdir = true;

View File

@@ -1,4 +1,4 @@
{stdenv, fetchurl, ocaml, findlib, type-conv, camlp4}:
{stdenv, fetchurl, ocaml, findlib, type_conv, camlp4}:
let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
};
buildInputs = [ocaml findlib];
propagatedBuildInputs = [type-conv camlp4];
propagatedBuildInputs = [type_conv camlp4];
createFindlibDestdir = true;

View File

@@ -1,4 +1,4 @@
{stdenv, buildOcaml, fetchurl, type-conv, camlp4}:
{stdenv, buildOcaml, fetchurl, type_conv, camlp4}:
buildOcaml rec {
minimumSupportedOcamlVersion = "4.02";
@@ -10,7 +10,7 @@ buildOcaml rec {
sha256 = "5f776aee295cc51c952aecd4b74b52dd2b850c665cc25b3d69bc42014d3ba073";
};
propagatedBuildInputs = [ type-conv camlp4 ];
propagatedBuildInputs = [ type_conv camlp4 ];
meta = with stdenv.lib; {
homepage = https://ocaml.janestreet.com/;

View File

@@ -1,4 +1,4 @@
{stdenv, buildOcaml, fetchurl, core, pa-ounit, pa-test, sexplib}:
{stdenv, buildOcaml, fetchurl, core, pa_ounit, pa_test, sexplib}:
buildOcaml rec {
name = "textutils";
@@ -11,8 +11,8 @@ buildOcaml rec {
sha256 = "605d9fde66dc2d777721c936aa521e17169c143efaf9ff29619a7f273a7d0052";
};
buildInputs = [ pa-test ];
propagatedBuildInputs = [ core pa-ounit sexplib ];
buildInputs = [ pa_test ];
propagatedBuildInputs = [ core pa_ounit sexplib ];
meta = with stdenv.lib; {
homepage = https://github.com/janestreet/textutils;

View File

@@ -7,7 +7,7 @@ in
assert stdenv.lib.versionOlder "3.12" ocaml_version;
stdenv.mkDerivation {
name = "ocaml-type-conv-108.08.00";
name = "ocaml-type_conv-108.08.00";
src = fetchurl {
url = https://ocaml.janestreet.com/ocaml-core/108.08.00/individual/type_conv-108.08.00.tar.gz;

View File

@@ -7,7 +7,7 @@ in
assert stdenv.lib.versionOlder "4.00" ocaml_version;
stdenv.mkDerivation {
name = "ocaml-type-conv-109.60.01";
name = "ocaml-type_conv-109.60.01";
src = fetchurl {
url = https://github.com/janestreet/type_conv/archive/109.60.01.tar.gz;

View File

@@ -3,7 +3,7 @@
buildOcaml rec {
minimumSupportedOcamlVersion = "4.02";
name = "type-conv";
name = "type_conv";
version = "112.01.01";
src = fetchurl {

View File

@@ -1,4 +1,4 @@
{stdenv, buildOcaml, fetchurl, type-conv}:
{stdenv, buildOcaml, fetchurl, type_conv}:
buildOcaml rec {
name = "typerep";
@@ -11,7 +11,7 @@ buildOcaml rec {
sha256 = "4f1ab611a00aaf774e9774b26b687233e0c70d91f684415a876f094a9969eada";
};
propagatedBuildInputs = [ type-conv ];
propagatedBuildInputs = [ type_conv ];
meta = with stdenv.lib; {
homepage = https://github.com/janestreet/typerep;

View File

@@ -1,4 +1,4 @@
{stdenv, buildOcaml, fetchurl, type-conv}:
{stdenv, buildOcaml, fetchurl, type_conv}:
buildOcaml rec {
name = "variantslib";
@@ -11,7 +11,7 @@ buildOcaml rec {
sha256 = "a948dcdd4ca54786fe0646386b6e37a9db03bf276c6557ea374d82740bf18055";
};
propagatedBuildInputs = [ type-conv ];
propagatedBuildInputs = [ type_conv ];
meta = with stdenv.lib; {
homepage = https://github.com/janestreet/variantslib;