From e082162f09a74ef0c5c962da6c27d33f77c7af56 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 26 Jun 2017 05:02:42 +0200 Subject: [PATCH] =?UTF-8?q?=20ocamlPackages.type=5Fconv-{108,109}:=20disab?= =?UTF-8?q?le=20for=20OCaml=20=E2=89=A5=204.03?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/type_conv/108.08.00.nix | 4 +++- pkgs/development/ocaml-modules/type_conv/109.60.01.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/type_conv/108.08.00.nix b/pkgs/development/ocaml-modules/type_conv/108.08.00.nix index 4a3d8c58f0b..f17e5a7b89e 100644 --- a/pkgs/development/ocaml-modules/type_conv/108.08.00.nix +++ b/pkgs/development/ocaml-modules/type_conv/108.08.00.nix @@ -1,6 +1,8 @@ {stdenv, fetchurl, ocaml, findlib, camlp4}: -assert stdenv.lib.versionOlder "3.12" ocaml.version; +if !stdenv.lib.versionAtLeast ocaml.version "3.12" +|| stdenv.lib.versionAtLeast ocaml.version "4.03" +then throw "type_conv-108.08.00 is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation { name = "ocaml-type_conv-108.08.00"; diff --git a/pkgs/development/ocaml-modules/type_conv/109.60.01.nix b/pkgs/development/ocaml-modules/type_conv/109.60.01.nix index ae2b62f6b36..5e6f5967d13 100644 --- a/pkgs/development/ocaml-modules/type_conv/109.60.01.nix +++ b/pkgs/development/ocaml-modules/type_conv/109.60.01.nix @@ -1,6 +1,8 @@ {stdenv, fetchurl, ocaml, findlib, camlp4}: -assert stdenv.lib.versionOlder "4.00" ocaml.version; +if !stdenv.lib.versionAtLeast ocaml.version "4.00" +|| stdenv.lib.versionAtLeast ocaml.version "4.03" +then throw "type_conv-109.60.01 is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation { name = "ocaml-type_conv-109.60.01";