diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-04-26 06:01:08 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-26 06:01:08 +0000 |
| commit | f8c265f433f3f5cf4bb4e25b03b75751c3aaf47a (patch) | |
| tree | 6336845aef4d3882b39256a810c7fe8419fc98cf /pkgs/build-support | |
| parent | 4a997ba4a66738d5c679c61a32cd57a7ca80d682 (diff) | |
| parent | 4586388f855782243da0e5f64b1b0144f692ef5b (diff) | |
| download | nixpkgs-f8c265f433f3f5cf4bb4e25b03b75751c3aaf47a.tar nixpkgs-f8c265f433f3f5cf4bb4e25b03b75751c3aaf47a.tar.gz nixpkgs-f8c265f433f3f5cf4bb4e25b03b75751c3aaf47a.tar.bz2 nixpkgs-f8c265f433f3f5cf4bb4e25b03b75751c3aaf47a.tar.lz nixpkgs-f8c265f433f3f5cf4bb4e25b03b75751c3aaf47a.tar.xz nixpkgs-f8c265f433f3f5cf4bb4e25b03b75751c3aaf47a.tar.zst nixpkgs-f8c265f433f3f5cf4bb4e25b03b75751c3aaf47a.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/ocaml/dune.nix | 4 | ||||
| -rw-r--r-- | pkgs/build-support/ocaml/oasis.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/build-support/ocaml/dune.nix b/pkgs/build-support/ocaml/dune.nix index f82bac7d199..2ded76d3cd4 100644 --- a/pkgs/build-support/ocaml/dune.nix +++ b/pkgs/build-support/ocaml/dune.nix @@ -7,8 +7,8 @@ let Dune = { "1" = dune_1; "2" = dune_2; "3" = dune_3; }."${dune-version}" ; in -if (args ? minimumOCamlVersion && ! lib.versionAtLeast ocaml.version args.minimumOCamlVersion) || - (args ? minimalOCamlVersion && ! lib.versionAtLeast ocaml.version args.minimalOCamlVersion) +if (args ? minimumOCamlVersion && lib.versionOlder ocaml.version args.minimumOCamlVersion) || + (args ? minimalOCamlVersion && lib.versionOlder ocaml.version args.minimalOCamlVersion) then throw "${pname}-${version} is not available for OCaml ${ocaml.version}" else diff --git a/pkgs/build-support/ocaml/oasis.nix b/pkgs/build-support/ocaml/oasis.nix index 8f81344daf0..91daad59050 100644 --- a/pkgs/build-support/ocaml/oasis.nix +++ b/pkgs/build-support/ocaml/oasis.nix @@ -8,7 +8,7 @@ }@args: if args ? minimumOCamlVersion && - ! lib.versionAtLeast ocaml.version args.minimumOCamlVersion + lib.versionOlder ocaml.version args.minimumOCamlVersion then throw "${pname}-${version} is not available for OCaml ${ocaml.version}" else |