nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-04-13 07:07:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

build-support.ocaml.dune: handle minimalOCamlVersion typo

Browse Source
This commit is contained in:
superherointj 2021-06-10 11:17:11 -03:00 committed by Vincent Laporte
parent a8aa34c80a
commit 15807923f9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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