Merge staging-next into staging

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";
+  };
 })

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 ];
   };