From b1f0e3ebc55ea8bde2806d83896e0f14db73a410 Mon Sep 17 00:00:00 2001
From: Merlin Göttlinger <megoettlinger@gmail.com>
Date: Wed, 7 Aug 2019 09:50:46 +0200
Subject: Suggested edits

---
 pkgs/build-support/ocaml/oasis.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'pkgs/build-support/ocaml')

diff --git a/pkgs/build-support/ocaml/oasis.nix b/pkgs/build-support/ocaml/oasis.nix
index 00f75c76597..74977486f2f 100644
--- a/pkgs/build-support/ocaml/oasis.nix
+++ b/pkgs/build-support/ocaml/oasis.nix
@@ -1,17 +1,19 @@
 { stdenv, ocaml_oasis, ocaml, findlib, ocamlbuild }:
 
-{ name, version, buildInputs ? [], meta ? { platforms = ocaml.meta.platforms or []; },
-  minimumOcamlVersion ? null,
+{ pname, version, buildInputs ? [], meta ? { platforms = ocaml.meta.platforms or []; },
+  minimumOCamlVersion ? null,
   createFindlibDestdir ? true,
   dontStrip ? true,
   ...
 }@args:
 
- assert minimumOcamlVersion != null ->
-          stdenv.lib.versionOlder minimumOcamlVersion ocaml.version;
+if args ? minimumOCamlVersion &&
+   ! stdenv.lib.versionAtLeast ocaml.version args.minimumOCamlVersion
+then throw "${pname}-${version} is not available for OCaml ${ocaml.version}"
+else
 
 stdenv.mkDerivation (args // {
-  name = "ocaml${ocaml.version}-${name}-${version}";
+  name = "ocaml${ocaml.version}-${pname}-${version}";
 
   buildInputs = [ ocaml findlib ocamlbuild ocaml_oasis ] ++ buildInputs;
 
-- 
cgit 1.4.1