From 598554d4768a9ca42143109f80ab53ccc9c0526c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 22 Feb 2019 16:59:41 +0000 Subject: [PATCH 1/6] =?UTF-8?q?ocamlPackages.atd:=20disable=20for=20OCaml?= =?UTF-8?q?=20=E2=89=A4=204.01?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/atd/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/ocaml-modules/atd/default.nix b/pkgs/development/ocaml-modules/atd/default.nix index e3e056f54426..c6047f4ea1b7 100644 --- a/pkgs/development/ocaml-modules/atd/default.nix +++ b/pkgs/development/ocaml-modules/atd/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "atd"; version = "2.0.0"; + minimumOCamlVersion = "4.02"; + src = fetchFromGitHub { owner = "mjambon"; repo = pname; From 91e194579dc1edd7351d8429899e8c1bf4fe6efa Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 22 Feb 2019 17:00:05 +0000 Subject: [PATCH 2/6] =?UTF-8?q?ocamlPackages.bisect=5Fppx-ocamlbuild:=20di?= =?UTF-8?q?sable=20for=20OCaml=20=E2=89=A4=204.01?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix b/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix index fd3e7d58ae31..38673fb9ddc4 100644 --- a/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix +++ b/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix @@ -1,6 +1,7 @@ { buildDunePackage, bisect_ppx, ocamlbuild }: buildDunePackage rec { + minimumOCamlVersion = "4.02"; inherit (bisect_ppx) version src meta; pname = "bisect_ppx-ocamlbuild"; propagatedBuildInputs = [ ocamlbuild ]; From 887a5373d6f48e59f54c5b9d1d1991e4507ded05 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 22 Feb 2019 17:00:22 +0000 Subject: [PATCH 3/6] =?UTF-8?q?ocamlPackages.dtoa:=20disable=20for=20OCaml?= =?UTF-8?q?=20=E2=89=A4=204.01?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/dtoa/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/dtoa/default.nix b/pkgs/development/ocaml-modules/dtoa/default.nix index a5164ab7fa9b..87d9ac7a324d 100644 --- a/pkgs/development/ocaml-modules/dtoa/default.nix +++ b/pkgs/development/ocaml-modules/dtoa/default.nix @@ -4,7 +4,7 @@ buildDunePackage rec { pname = "dtoa"; version = "0.3.1"; - minimumOCamlVersion = "4.01"; + minimumOCamlVersion = "4.02"; src = fetchurl { url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz"; From a03930d9d5cb7743df411e8d8fc376e826658351 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 22 Feb 2019 17:00:32 +0000 Subject: [PATCH 4/6] =?UTF-8?q?ocamlPackages.opti:=20disable=20for=20OCaml?= =?UTF-8?q?=20=E2=89=A4=204.01?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/opti/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/ocaml-modules/opti/default.nix b/pkgs/development/ocaml-modules/opti/default.nix index 7b084e61688b..f6552d57683f 100644 --- a/pkgs/development/ocaml-modules/opti/default.nix +++ b/pkgs/development/ocaml-modules/opti/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "opti"; version = "1.0.3"; + minimumOCamlVersion = "4.02"; + src = fetchurl { url = "https://github.com/magnusjonsson/opti/releases/download/${version}/opti-${version}.tbz"; sha256 = "ed9ba56dc06e9d2b1bf097964cc65ea37db787d4f239c13d0dd74693f5b50a1e"; From 9a666f92a24bc1dd35b9f785c8a3a40907ad451b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 22 Feb 2019 17:00:43 +0000 Subject: [PATCH 5/6] =?UTF-8?q?ocamlPackages.wtf8:=20disable=20for=20OCaml?= =?UTF-8?q?=20=E2=89=A4=204.01?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/wtf8/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/wtf8/default.nix b/pkgs/development/ocaml-modules/wtf8/default.nix index 7f3686abb51a..4c820d13808d 100644 --- a/pkgs/development/ocaml-modules/wtf8/default.nix +++ b/pkgs/development/ocaml-modules/wtf8/default.nix @@ -4,7 +4,7 @@ buildDunePackage rec { pname = "wtf8"; version = "1.0.1"; - minimumOCamlVersion = "4.01"; + minimumOCamlVersion = "4.02"; src = fetchurl { url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz"; From 74d519b234bd851bd785e093160a837cafafe9f1 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 22 Feb 2019 17:00:57 +0000 Subject: [PATCH 6/6] =?UTF-8?q?ocamlPackages.utop:=20disable=20for=20OCaml?= =?UTF-8?q?=20=E2=89=A4=204.02?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/tools/ocaml/utop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index be6bb73aab81..d9e563952ea7 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -2,7 +2,7 @@ , lambdaTerm, cppo, makeWrapper }: -if !stdenv.lib.versionAtLeast ocaml.version "4.02" +if !stdenv.lib.versionAtLeast ocaml.version "4.03" then throw "utop is not available for OCaml ${ocaml.version}" else