From 5b3290333a2048e07aadaa2dc934a2335525ba0a Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 16 Mar 2021 17:04:07 +0100 Subject: [PATCH] ocamlPackages.ocaml_extlib: add support for OCaml 4.12 Pull in patches from https://github.com/ygrek/ocaml-extlib/pull/55 which add support for OCaml 4.12. These patches are also included in extlib 1.7.8, however extlib 1.7.8 includes some API changes which break for example google-drive-ocamlfuse. Therefore we follow the opam repository and patch our default extlib version: https://github.com/ocaml/opam-repository/pull/18041 --- pkgs/development/ocaml-modules/extlib/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/pkgs/development/ocaml-modules/extlib/default.nix index a8b1810e51f..2a437cd29d3 100644 --- a/pkgs/development/ocaml-modules/extlib/default.nix +++ b/pkgs/development/ocaml-modules/extlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, ocaml, findlib, cppo, minimal ? true }: +{ stdenv, lib, fetchurl, fetchpatch, ocaml, findlib, cppo, minimal ? true }: assert lib.versionAtLeast (lib.getVersion ocaml) "3.11"; @@ -10,6 +10,13 @@ stdenv.mkDerivation { sha256 = "1sxmzc1mx3kg62j8kbk0dxkx8mkf1rn70h542cjzrziflznap0s1"; }; + patches = [ + (fetchpatch { + url = "https://github.com/ygrek/ocaml-extlib/pull/55.patch"; + sha256 = "0mj3xii56rh8j8brdyv5d06rbs6jjjcy4ib9chafkq3f3sbq795p"; + }) + ]; + buildInputs = [ ocaml findlib cppo ]; createFindlibDestdir = true;