public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename ocaml_typeconv to type_conv

Browse Source 
The actual name of the package is type_conv
(https://github.com/janestreet/type_conv). Having it named
ocaml_typeconv adds a verbosity that isn't required and actually makes
the package harder to find.
This commit is contained in:
Eric Merritt 2015-05-24 10:45:01 -07:00
parent 82e098fd93
commit 8751d1ea1a
9 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/ocaml-modules/fieldslib/default.nix
View File

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

4
pkgs/development/ocaml-modules/odn/default.nix
View File

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

4
pkgs/development/ocaml-modules/sexplib/108.08.00.nix
View File

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

4
pkgs/development/ocaml-modules/sexplib/default.nix
View File

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

2
pkgs/development/ocaml-modules/typeconv/108.08.00.nix → pkgs/development/ocaml-modules/type_conv/108.08.00.nix
View File

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

2
pkgs/development/ocaml-modules/typeconv/109.60.01.nix → pkgs/development/ocaml-modules/type_conv/109.60.01.nix
View File

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

2
pkgs/development/ocaml-modules/typeconv/112.01.01.nix → pkgs/development/ocaml-modules/type_conv/112.01.01.nix
View File

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

4
pkgs/development/tools/ocaml/oasis/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, ocaml, findlib, ocaml_data_notation, ocaml_typeconv, camlp4, {stdenv, fetchurl, ocaml, findlib, ocaml_data_notation, type_conv, camlp4,
ocamlmod, ocamlify, ounit, expect}: ocamlmod, ocamlify, ounit, expect}:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -13,7 +13,7 @@ stdenv.mkDerivation {
buildInputs = buildInputs =
[ [
ocaml findlib ocaml_typeconv ocamlmod ocamlify ounit camlp4 ocaml findlib type_conv ocamlmod ocamlify ounit camlp4
]; ];
propagatedBuildInputs = [ ocaml_data_notation ]; propagatedBuildInputs = [ ocaml_data_notation ];

23
pkgs/top-level/all-packages.nix
View File

@ -4133,9 +4133,7 @@ let
eliom = callPackage ../development/ocaml-modules/eliom { }; eliom = callPackage ../development/ocaml-modules/eliom { };
enumerate = callPackage ../development/ocaml-modules/enumerate { enumerate = callPackage ../development/ocaml-modules/enumerate { };
type_conv = ocaml_typeconv;
};
erm_xml = callPackage ../development/ocaml-modules/erm_xml { }; erm_xml = callPackage ../development/ocaml-modules/erm_xml { };
@ -4293,21 +4291,20 @@ let
camlp5 = camlp5_transitional; camlp5 = camlp5_transitional;
}; };
typeconv_108_08_00 = callPackage ../development/ocaml-modules/typeconv/108.08.00.nix { }; type_conv_108_08_00 = callPackage ../development/ocaml-modules/type_conv/108.08.00.nix { };
typeconv_109_60_01 = callPackage ../development/ocaml-modules/typeconv/109.60.01.nix { }; type_conv_109_60_01 = callPackage ../development/ocaml-modules/type_conv/109.60.01.nix { };
typeconv_112_01_01 = callPackage ../development/ocaml-modules/typeconv/112.01.01.nix { }; type_conv_112_01_01 = callPackage ../development/ocaml-modules/type_conv/112.01.01.nix { };
ocaml_typeconv = type_conv =
if lib.versionOlder "4.02" ocaml_version if lib.versionOlder "4.02" ocaml_version
then typeconv_112_01_01 then type_conv_112_01_01
else if lib.versionOlder "4.00" ocaml_version else if lib.versionOlder "4.00" ocaml_version
then typeconv_109_60_01 then type_conv_109_60_01
else if lib.versionOlder "3.12" ocaml_version else if lib.versionOlder "3.12" ocaml_version
then typeconv_108_08_00 then type_conv_108_08_00
else null; else null;
sexplib_108_08_00 = callPackage ../development/ocaml-modules/sexplib/108.08.00.nix { sexplib_108_08_00 = callPackage ../development/ocaml-modules/sexplib/108.08.00.nix { };
typeconv = typeconv_108_08_00;
};
ocaml_sexplib = ocaml_sexplib =
if lib.versionOlder "4.00" ocaml_version if lib.versionOlder "4.00" ocaml_version
then callPackage ../development/ocaml-modules/sexplib { } then callPackage ../development/ocaml-modules/sexplib { }