diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-06-11 12:04:38 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-11 12:04:38 +0000 |
| commit | 212846c302a1e805d325b256111e6833f2ae30ba (patch) | |
| tree | a127e4f094b2451a3818dcadf277ba9d8b5a5246 /pkgs/build-support | |
| parent | c6b711737d1bc9dc61e0072b5a34112dcbbab84c (diff) | |
| parent | 8abb6b4488e75203a9b20fbe286e53ee2582c026 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/ocaml/dune.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/build-support/ocaml/dune.nix b/pkgs/build-support/ocaml/dune.nix index 56fe8a60484ed..c049878d01311 100644 --- a/pkgs/build-support/ocaml/dune.nix +++ b/pkgs/build-support/ocaml/dune.nix @@ -4,8 +4,8 @@ let Dune = if args.useDune2 or false then dune_2 else dune_1; in -if args ? minimumOCamlVersion && - ! lib.versionAtLeast ocaml.version args.minimumOCamlVersion +if (args ? minimumOCamlVersion && ! lib.versionAtLeast ocaml.version args.minimumOCamlVersion) || + (args ? minimalOCamlVersion && ! lib.versionAtLeast ocaml.version args.minimalOCamlVersion) then throw "${pname}-${version} is not available for OCaml ${ocaml.version}" else @@ -29,7 +29,7 @@ stdenv.mkDerivation ({ runHook postInstall ''; -} // args // { +} // (builtins.removeAttrs args [ "minimalOCamlVersion" ]) // { name = "ocaml${ocaml.version}-${pname}-${version}"; |