diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-04 18:01:19 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-04 18:01:19 +0000 |
| commit | 437813752bf01781552b44b4d907986b1032874d (patch) | |
| tree | 16bf51994e756ba38e2fb82deb92a3c3dd33f408 /pkgs/development/compilers | |
| parent | afdcf37462af9e06d92869548f2ab6876cb5df8e (diff) | |
| parent | fbf2e10a0d1ef929bfa37c1495fecd38bf890a2d (diff) | |
| download | nixpkgs-437813752bf01781552b44b4d907986b1032874d.tar nixpkgs-437813752bf01781552b44b4d907986b1032874d.tar.gz nixpkgs-437813752bf01781552b44b4d907986b1032874d.tar.bz2 nixpkgs-437813752bf01781552b44b4d907986b1032874d.tar.lz nixpkgs-437813752bf01781552b44b4d907986b1032874d.tar.xz nixpkgs-437813752bf01781552b44b4d907986b1032874d.tar.zst nixpkgs-437813752bf01781552b44b4d907986b1032874d.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/haxe/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/reason/default.nix | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index d5277899892..4ac022be6a9 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -3,7 +3,7 @@ let ocamlDependencies = version: if lib.versionAtLeast version "4.2" - then with ocaml-ng.ocamlPackages; [ + then with ocaml-ng.ocamlPackages_4_12; [ ocaml findlib sedlex_2 diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index 0937ff8bd84..4404a510828 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -2,6 +2,9 @@ , fix, menhir, menhirLib, menhirSdk, merlin-extend, ppxlib, utop, cppo, ppx_derivers }: +lib.throwIfNot (lib.versionOlder ocaml.version "4.13") + "reason is not available for OCaml ${ocaml.version}" + stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-reason"; version = "3.7.0"; |