nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-20 02:55:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

build-support/ocaml: deprecate minimumOCamlVersion (#319907)

Browse Source 
* ocamlPackages.wtf8: use minimalOCamlVersion

* ocamlPackages.ppx_yojson_conv: minimalOCamlVersion

* ocamlPackages.postgresql: use minimalOCamlVersion

* ocamlPackages.opti: use minimalOCamlVersion

* ocamlPackages.opam-repository: use minimalOCamlVersion

* ocamlPackages.opam-format: use minimalOCamlVersion

* ocamlPackages.lwt-dllist: use minimalOCamlVersion

* ocamlPackages.lacaml: use minimalOCamlVersion

* ocamlPackages.gnuplot: use minimalOCamlVersion

* ocamlPackages.fix: use minimalOCamlVersion

* ocamlPackages.eigen: use minimalOCamlVersion

* ocamlPackages.earley: use minimalOCamlVersion

* ocamlPackages.directories: use minimalOCamlVersion

* ocamlPackages.cpuid: use minimalOCamlVersion

* build-support/ocaml: deprecate minimumOCamlVersion

* build-support/ocaml: deprecate minimumOCamlVersion

---------

Co-authored-by: Vincent Laporte <Vincent.Laporte@gmail.com>
This commit is contained in:
superherointj 2024-06-21 05:29:31 -03:00 committed by GitHub
parent 3688b2e901
commit 40ae5e072c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
16 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/languages-frameworks/ocaml.section.md
View File

@ -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

3
pkgs/build-support/ocaml/dune.nix
View File

@ -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

2
pkgs/development/ocaml-modules/cpuid/default.nix
View File

@ -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";

2
pkgs/development/ocaml-modules/directories/default.nix
View File

@ -5,7 +5,7 @@ buildDunePackage rec {
version = "0.5";
useDune2 = true;
minimumOCamlVersion = "4.07";
minimalOCamlVersion = "4.07";
src = fetchFromGitHub {
owner = "ocamlpro";

2
pkgs/development/ocaml-modules/earley/default.nix
View File

@ -12,7 +12,7 @@ buildDunePackage rec {
sha256 = "1vi58zdxchpw6ai0bz9h2ggcmg8kv57yk6qbx82lh47s5wb3mz5y";
};
minimumOCamlVersion = "4.07";
minimalOCamlVersion = "4.07";
useDune2 = true;
buildInputs = [ stdlib-shims ];

2
pkgs/development/ocaml-modules/eigen/default.nix
View File

@ -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";

2
pkgs/development/ocaml-modules/fix/default.nix
View File

@ -12,7 +12,7 @@ buildDunePackage rec {
sha256 = "sha256-Xuw4pEPqAbQjSHrpMCNE7Th0mpbNMSxdEdwvH4hu2SM=";
};
minimumOCamlVersion = "4.03";
minimalOCamlVersion = "4.03";
useDune2 = true;
meta = with lib; {

2
pkgs/development/ocaml-modules/gnuplot/default.nix
View File

@ -6,7 +6,7 @@ buildDunePackage rec {
useDune2 = true;
minimumOCamlVersion = "4.03";
minimalOCamlVersion = "4.03";
src = fetchFromGitHub {
owner = "c-cube";

2
pkgs/development/ocaml-modules/lacaml/default.nix
View File

@ -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";

2
pkgs/development/ocaml-modules/lwt-dllist/default.nix
View File

@ -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";

2
pkgs/development/ocaml-modules/opam-format/default.nix
View File

@ -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

2
pkgs/development/ocaml-modules/opam-repository/default.nix
View File

@ -3,7 +3,7 @@
buildDunePackage rec {
pname = "opam-repository";
minimumOCamlVersion = "4.02";
minimalOCamlVersion = "4.02";
useDune2 = true;

2
pkgs/development/ocaml-modules/opti/default.nix
View File

@ -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";

2
pkgs/development/ocaml-modules/postgresql/default.nix
View File

@ -6,7 +6,7 @@ buildDunePackage rec {
useDune2 = true;
minimumOCamlVersion = "4.08";
minimalOCamlVersion = "4.08";
src = fetchFromGitHub {
owner = "mmottl";

2
pkgs/development/ocaml-modules/ppx_yojson_conv/default.nix
View File

@ -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";

2
pkgs/development/ocaml-modules/wtf8/default.nix
View File

@ -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";