diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-04-27 12:07:01 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-27 12:07:01 +0000 |
| commit | c01456266d66ab608397b709e791901a668297ca (patch) | |
| tree | f45de9083c5c44c6fdbcd68bd1eb9f36a084e6bb /pkgs/development/ocaml-modules | |
| parent | 92003c2ff7446e24895d33c12d35a4f2573ed384 (diff) | |
| parent | 9f58b1413a66cf66e028b787c7dda6c640c2a8e8 (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/ocaml-modules')
| -rw-r--r-- | pkgs/development/ocaml-modules/extlib/1.7.7.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/janestreet/0.14.nix | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/development/ocaml-modules/extlib/1.7.7.nix b/pkgs/development/ocaml-modules/extlib/1.7.7.nix index 3314ebcb9b5dd..d27fe085569f1 100644 --- a/pkgs/development/ocaml-modules/extlib/1.7.7.nix +++ b/pkgs/development/ocaml-modules/extlib/1.7.7.nix @@ -1,11 +1,14 @@ # Older version of extlib for Haxe 4.0 and 4.1. # May be replaceable by the next extlib + extlib-base64 release. -{ fetchurl, ocaml_extlib }: +{ lib, fetchurl, ocaml, ocaml_extlib }: -ocaml_extlib.overrideAttrs (_: rec { +ocaml_extlib.overrideAttrs (x: rec { version = "1.7.7"; src = fetchurl { url = "https://github.com/ygrek/ocaml-extlib/releases/download/${version}/extlib-${version}.tar.gz"; sha256 = "1sxmzc1mx3kg62j8kbk0dxkx8mkf1rn70h542cjzrziflznap0s1"; }; + meta = x.meta // { + broken = lib.versionAtLeast ocaml.version "4.12"; + }; }) diff --git a/pkgs/development/ocaml-modules/janestreet/0.14.nix b/pkgs/development/ocaml-modules/janestreet/0.14.nix index eb429b2bb6dc8..e348c5d9325a1 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.14.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.14.nix @@ -1,4 +1,5 @@ { self +, lib , openssl , zstd }: @@ -40,6 +41,7 @@ with self; version = "0.14.1"; hash = "1cdkv34m6czhacivpbb2sasj83fgcid6gnqk30ig9i84z8nh2gw2"; meta.description = "Accessors for Core types, for use with the Accessor library"; + meta.broken = lib.versionAtLeast ocaml.version "4.12"; propagatedBuildInputs = [ accessor_base core_kernel ]; }; |