diff options
author | Eric Merritt <eric@afiniate.com> | 2015-05-24 10:45:01 -0700 |
---|---|---|
committer | Eric Merritt <eric@afiniate.com> | 2015-05-24 12:32:45 -0700 |
commit | 8751d1ea1a43d877ebce2b57b2ce2f1bb1087593 (patch) | |
tree | ca4fa32a5a3672335b409402e1363e2c306b9184 /pkgs/development/ocaml-modules | |
parent | 82e098fd9319fe4e23c98819972fa3a0206442bf (diff) | |
download | nixpkgs-8751d1ea1a43d877ebce2b57b2ce2f1bb1087593.tar nixpkgs-8751d1ea1a43d877ebce2b57b2ce2f1bb1087593.tar.gz nixpkgs-8751d1ea1a43d877ebce2b57b2ce2f1bb1087593.tar.bz2 nixpkgs-8751d1ea1a43d877ebce2b57b2ce2f1bb1087593.tar.lz nixpkgs-8751d1ea1a43d877ebce2b57b2ce2f1bb1087593.tar.xz nixpkgs-8751d1ea1a43d877ebce2b57b2ce2f1bb1087593.tar.zst nixpkgs-8751d1ea1a43d877ebce2b57b2ce2f1bb1087593.zip |
rename ocaml_typeconv to type_conv
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.
Diffstat (limited to 'pkgs/development/ocaml-modules')
-rw-r--r-- | pkgs/development/ocaml-modules/fieldslib/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/odn/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/sexplib/108.08.00.nix | 4 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/sexplib/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/type_conv/108.08.00.nix (renamed from pkgs/development/ocaml-modules/typeconv/108.08.00.nix) | 2 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/type_conv/109.60.01.nix (renamed from pkgs/development/ocaml-modules/typeconv/109.60.01.nix) | 2 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/type_conv/112.01.01.nix (renamed from pkgs/development/ocaml-modules/typeconv/112.01.01.nix) | 2 |
7 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/development/ocaml-modules/fieldslib/default.nix b/pkgs/development/ocaml-modules/fieldslib/default.nix index 28b83d3af46..38548790329 100644 --- a/pkgs/development/ocaml-modules/fieldslib/default.nix +++ b/pkgs/development/ocaml-modules/fieldslib/default.nix @@ -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); @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; buildInputs = [ ocaml findlib ]; - propagatedBuildInputs = [ ocaml_typeconv camlp4 ]; + propagatedBuildInputs = [ type_conv camlp4 ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/odn/default.nix b/pkgs/development/ocaml-modules/odn/default.nix index bfffb67d4b0..eaeb7e7b22f 100644 --- a/pkgs/development/ocaml-modules/odn/default.nix +++ b/pkgs/development/ocaml-modules/odn/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, ocaml_typeconv, 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 ocaml_typeconv ounit camlp4]; + buildInputs = [ocaml findlib type_conv ounit camlp4]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix b/pkgs/development/ocaml-modules/sexplib/108.08.00.nix index bde9c271371..dd9e89bcef7 100644 --- a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix +++ b/pkgs/development/ocaml-modules/sexplib/108.08.00.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, typeconv, 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 = [typeconv camlp4]; + propagatedBuildInputs = [type_conv camlp4]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/sexplib/default.nix b/pkgs/development/ocaml-modules/sexplib/default.nix index a32c6a0e2ce..f816f80e51e 100644 --- a/pkgs/development/ocaml-modules/sexplib/default.nix +++ b/pkgs/development/ocaml-modules/sexplib/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, ocaml_typeconv, 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 = [ocaml_typeconv camlp4]; + propagatedBuildInputs = [type_conv camlp4]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/typeconv/108.08.00.nix b/pkgs/development/ocaml-modules/type_conv/108.08.00.nix index 24daa366b2a..d3e32105f7d 100644 --- a/pkgs/development/ocaml-modules/typeconv/108.08.00.nix +++ b/pkgs/development/ocaml-modules/type_conv/108.08.00.nix @@ -7,7 +7,7 @@ in assert stdenv.lib.versionOlder "3.12" ocaml_version; stdenv.mkDerivation { - name = "ocaml-typeconv-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; diff --git a/pkgs/development/ocaml-modules/typeconv/109.60.01.nix b/pkgs/development/ocaml-modules/type_conv/109.60.01.nix index 359f906ce34..fe42dd5ddcb 100644 --- a/pkgs/development/ocaml-modules/typeconv/109.60.01.nix +++ b/pkgs/development/ocaml-modules/type_conv/109.60.01.nix @@ -7,7 +7,7 @@ in assert stdenv.lib.versionOlder "4.00" ocaml_version; stdenv.mkDerivation { - name = "ocaml-typeconv-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; diff --git a/pkgs/development/ocaml-modules/typeconv/112.01.01.nix b/pkgs/development/ocaml-modules/type_conv/112.01.01.nix index fd7ebc28b97..e65306d1501 100644 --- a/pkgs/development/ocaml-modules/typeconv/112.01.01.nix +++ b/pkgs/development/ocaml-modules/type_conv/112.01.01.nix @@ -3,7 +3,7 @@ buildOcaml rec { minimumSupportedOcamlVersion = "4.02"; - name = "typeconv"; + name = "type_conv"; version = "112.01.01"; src = fetchurl { |