diff --git a/doc/languages-frameworks/ocaml.section.md b/doc/languages-frameworks/ocaml.section.md index 44f514e90a1b..46fddcb3b9de 100644 --- a/doc/languages-frameworks/ocaml.section.md +++ b/doc/languages-frameworks/ocaml.section.md @@ -120,14 +120,6 @@ buildDunePackage rec { } ``` -Note about `minimalOCamlVersion`. A deprecated version of this argument was -spelled `minimumOCamlVersion`; setting the old attribute wrongly modifies the -derivation hash and is therefore inappropriate. As a technical dept, currently -packaged libraries may still use the old spelling: maintainers are invited to -fix this when updating packages. Massive renaming is strongly discouraged as it -would be challenging to review, difficult to test, and will cause unnecessary -rebuild. - The build will automatically fail if two distinct versions of the same library are added to `buildInputs` (which usually happens transitively because of `propagatedBuildInputs`). Set `dontDetectOcamlConflicts` to true to disable this diff --git a/pkgs/build-support/ocaml/dune.nix b/pkgs/build-support/ocaml/dune.nix index 972244f80b0a..e293605cb31d 100644 --- a/pkgs/build-support/ocaml/dune.nix +++ b/pkgs/build-support/ocaml/dune.nix @@ -7,8 +7,7 @@ let Dune = { "1" = dune_1; "2" = dune_2; "3" = dune_3; }."${dune-version}" ; in -if (args ? minimumOCamlVersion && lib.versionOlder ocaml.version args.minimumOCamlVersion) || - (args ? minimalOCamlVersion && lib.versionOlder ocaml.version args.minimalOCamlVersion) +if args ? minimalOCamlVersion && lib.versionOlder ocaml.version args.minimalOCamlVersion then throw "${pname}-${version} is not available for OCaml ${ocaml.version}" else diff --git a/pkgs/development/ocaml-modules/cpuid/default.nix b/pkgs/development/ocaml-modules/cpuid/default.nix index a0c28bc92d9a..7afbd8432399 100644 --- a/pkgs/development/ocaml-modules/cpuid/default.nix +++ b/pkgs/development/ocaml-modules/cpuid/default.nix @@ -6,7 +6,7 @@ buildDunePackage rec { useDune2 = true; - minimumOCamlVersion = "4.03"; + minimalOCamlVersion = "4.03"; src = fetchurl { url = "https://github.com/pqwy/cpuid/releases/download/v${version}/cpuid-v${version}.tbz"; diff --git a/pkgs/development/ocaml-modules/directories/default.nix b/pkgs/development/ocaml-modules/directories/default.nix index 79f994458ca6..5f86db245470 100644 --- a/pkgs/development/ocaml-modules/directories/default.nix +++ b/pkgs/development/ocaml-modules/directories/default.nix @@ -5,7 +5,7 @@ buildDunePackage rec { version = "0.5"; useDune2 = true; - minimumOCamlVersion = "4.07"; + minimalOCamlVersion = "4.07"; src = fetchFromGitHub { owner = "ocamlpro"; diff --git a/pkgs/development/ocaml-modules/earley/default.nix b/pkgs/development/ocaml-modules/earley/default.nix index 0d365c8036dd..a679ee1ed4fd 100644 --- a/pkgs/development/ocaml-modules/earley/default.nix +++ b/pkgs/development/ocaml-modules/earley/default.nix @@ -12,7 +12,7 @@ buildDunePackage rec { sha256 = "1vi58zdxchpw6ai0bz9h2ggcmg8kv57yk6qbx82lh47s5wb3mz5y"; }; - minimumOCamlVersion = "4.07"; + minimalOCamlVersion = "4.07"; useDune2 = true; buildInputs = [ stdlib-shims ]; diff --git a/pkgs/development/ocaml-modules/eigen/default.nix b/pkgs/development/ocaml-modules/eigen/default.nix index 16a69db3b2fc..5c75c4cb1044 100644 --- a/pkgs/development/ocaml-modules/eigen/default.nix +++ b/pkgs/development/ocaml-modules/eigen/default.nix @@ -13,7 +13,7 @@ buildDunePackage rec { sha256 = "1zaw03as14hyvfpyj6bjrfbcxp2ljdbqcqqgm53kms244mig425f"; }; - minimumOCamlVersion = "4.02"; + minimalOCamlVersion = "4.02"; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; diff --git a/pkgs/development/ocaml-modules/fix/default.nix b/pkgs/development/ocaml-modules/fix/default.nix index 1d738dfb32cc..844059849bfc 100644 --- a/pkgs/development/ocaml-modules/fix/default.nix +++ b/pkgs/development/ocaml-modules/fix/default.nix @@ -12,7 +12,7 @@ buildDunePackage rec { sha256 = "sha256-Xuw4pEPqAbQjSHrpMCNE7Th0mpbNMSxdEdwvH4hu2SM="; }; - minimumOCamlVersion = "4.03"; + minimalOCamlVersion = "4.03"; useDune2 = true; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/gnuplot/default.nix b/pkgs/development/ocaml-modules/gnuplot/default.nix index 038863aad978..6b30ac5848c4 100644 --- a/pkgs/development/ocaml-modules/gnuplot/default.nix +++ b/pkgs/development/ocaml-modules/gnuplot/default.nix @@ -6,7 +6,7 @@ buildDunePackage rec { useDune2 = true; - minimumOCamlVersion = "4.03"; + minimalOCamlVersion = "4.03"; src = fetchFromGitHub { owner = "c-cube"; diff --git a/pkgs/development/ocaml-modules/lacaml/default.nix b/pkgs/development/ocaml-modules/lacaml/default.nix index 04880bca3ac5..e8d0e966c40f 100644 --- a/pkgs/development/ocaml-modules/lacaml/default.nix +++ b/pkgs/development/ocaml-modules/lacaml/default.nix @@ -10,7 +10,7 @@ buildDunePackage rec { useDune2 = true; - minimumOCamlVersion = "4.08"; + minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/mmottl/lacaml/releases/download/${version}/lacaml-${version}.tbz"; diff --git a/pkgs/development/ocaml-modules/lwt-dllist/default.nix b/pkgs/development/ocaml-modules/lwt-dllist/default.nix index b28981b1b779..88ad74b3e652 100644 --- a/pkgs/development/ocaml-modules/lwt-dllist/default.nix +++ b/pkgs/development/ocaml-modules/lwt-dllist/default.nix @@ -6,7 +6,7 @@ buildDunePackage rec { useDune2 = true; - minimumOCamlVersion = "4.02"; + minimalOCamlVersion = "4.02"; src = fetchurl { url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; diff --git a/pkgs/development/ocaml-modules/opam-format/default.nix b/pkgs/development/ocaml-modules/opam-format/default.nix index fdb8ba33d5eb..1360c6281636 100644 --- a/pkgs/development/ocaml-modules/opam-format/default.nix +++ b/pkgs/development/ocaml-modules/opam-format/default.nix @@ -7,7 +7,7 @@ buildDunePackage rec { inherit (opam-core) src version; - minimumOCamlVersion = "4.02.3"; + minimalOCamlVersion = "4.02.3"; # get rid of check for curl at configure time # opam-format does not call curl at run time diff --git a/pkgs/development/ocaml-modules/opam-repository/default.nix b/pkgs/development/ocaml-modules/opam-repository/default.nix index ff9ad75fad86..008cc2812453 100644 --- a/pkgs/development/ocaml-modules/opam-repository/default.nix +++ b/pkgs/development/ocaml-modules/opam-repository/default.nix @@ -3,7 +3,7 @@ buildDunePackage rec { pname = "opam-repository"; - minimumOCamlVersion = "4.02"; + minimalOCamlVersion = "4.02"; useDune2 = true; diff --git a/pkgs/development/ocaml-modules/opti/default.nix b/pkgs/development/ocaml-modules/opti/default.nix index 4ce5087912d2..1d854a1fda50 100644 --- a/pkgs/development/ocaml-modules/opti/default.nix +++ b/pkgs/development/ocaml-modules/opti/default.nix @@ -6,7 +6,7 @@ buildDunePackage rec { useDune2 = true; - minimumOCamlVersion = "4.02"; + minimalOCamlVersion = "4.02"; src = fetchurl { url = "https://github.com/magnusjonsson/opti/releases/download/${version}/opti-${version}.tbz"; diff --git a/pkgs/development/ocaml-modules/postgresql/default.nix b/pkgs/development/ocaml-modules/postgresql/default.nix index 4140baa675cb..25dddaed08c9 100644 --- a/pkgs/development/ocaml-modules/postgresql/default.nix +++ b/pkgs/development/ocaml-modules/postgresql/default.nix @@ -6,7 +6,7 @@ buildDunePackage rec { useDune2 = true; - minimumOCamlVersion = "4.08"; + minimalOCamlVersion = "4.08"; src = fetchFromGitHub { owner = "mmottl"; diff --git a/pkgs/development/ocaml-modules/ppx_yojson_conv/default.nix b/pkgs/development/ocaml-modules/ppx_yojson_conv/default.nix index 27d07649d408..b80adedbc753 100644 --- a/pkgs/development/ocaml-modules/ppx_yojson_conv/default.nix +++ b/pkgs/development/ocaml-modules/ppx_yojson_conv/default.nix @@ -10,7 +10,7 @@ buildDunePackage rec { pname = "ppx_yojson_conv"; version = "0.15.1"; duneVersion = "3"; - minimumOCamlVersion = "4.08.0"; + minimalOCamlVersion = "4.08.0"; src = fetchFromGitHub { owner = "janestreet"; diff --git a/pkgs/development/ocaml-modules/wtf8/default.nix b/pkgs/development/ocaml-modules/wtf8/default.nix index bc071f9305f8..456fe129c8b1 100644 --- a/pkgs/development/ocaml-modules/wtf8/default.nix +++ b/pkgs/development/ocaml-modules/wtf8/default.nix @@ -6,7 +6,7 @@ buildDunePackage rec { useDune2 = true; - minimumOCamlVersion = "4.02"; + minimalOCamlVersion = "4.02"; src = fetchurl { url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz";