diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-02-23 15:08:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-23 15:08:34 +0100 |
| commit | d73bc6d06a6f36bc2d120d11f49d68b6f9e0f06c (patch) | |
| tree | 5d2f3a685e4df8b84aa54d13bd6bffc0e3b1e42a | |
| parent | 041b40105ca7976d774e72af392c0a67852f258c (diff) | |
| parent | 74d519b234bd851bd785e093160a837cafafe9f1 (diff) | |
| download | nixpkgs-d73bc6d06a6f36bc2d120d11f49d68b6f9e0f06c.tar nixpkgs-d73bc6d06a6f36bc2d120d11f49d68b6f9e0f06c.tar.gz nixpkgs-d73bc6d06a6f36bc2d120d11f49d68b6f9e0f06c.tar.bz2 nixpkgs-d73bc6d06a6f36bc2d120d11f49d68b6f9e0f06c.tar.lz nixpkgs-d73bc6d06a6f36bc2d120d11f49d68b6f9e0f06c.tar.xz nixpkgs-d73bc6d06a6f36bc2d120d11f49d68b6f9e0f06c.tar.zst nixpkgs-d73bc6d06a6f36bc2d120d11f49d68b6f9e0f06c.zip | |
Merge pull request #56206 from vbgl/ocaml-cleaning-ligustro
ocamlPackages: disable a few libraries that do not build with old OCaml versions
6 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/development/ocaml-modules/atd/default.nix b/pkgs/development/ocaml-modules/atd/default.nix index e3e056f5442..c6047f4ea1b 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; diff --git a/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix b/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix index fd3e7d58ae3..38673fb9ddc 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 ]; diff --git a/pkgs/development/ocaml-modules/dtoa/default.nix b/pkgs/development/ocaml-modules/dtoa/default.nix index a5164ab7fa9..87d9ac7a324 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"; diff --git a/pkgs/development/ocaml-modules/opti/default.nix b/pkgs/development/ocaml-modules/opti/default.nix index 7b084e61688..f6552d57683 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"; diff --git a/pkgs/development/ocaml-modules/wtf8/default.nix b/pkgs/development/ocaml-modules/wtf8/default.nix index 7f3686abb51..4c820d13808 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"; diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index be6bb73aab8..d9e563952ea 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 |