summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorsternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>2021-03-16 17:04:07 +0100
committerVincent Laporte <vbgl@users.noreply.github.com>2021-03-16 19:10:29 +0100
commit5b3290333a2048e07aadaa2dc934a2335525ba0a (patch)
tree06648b7dd37aec5cb4fb46de049504fd6a67402d /pkgs
parent22e17d823d6f3591d7ad3ff7e120a3f1814d71e4 (diff)
downloadnixpkgs-5b3290333a2048e07aadaa2dc934a2335525ba0a.tar
nixpkgs-5b3290333a2048e07aadaa2dc934a2335525ba0a.tar.gz
nixpkgs-5b3290333a2048e07aadaa2dc934a2335525ba0a.tar.bz2
nixpkgs-5b3290333a2048e07aadaa2dc934a2335525ba0a.tar.lz
nixpkgs-5b3290333a2048e07aadaa2dc934a2335525ba0a.tar.xz
nixpkgs-5b3290333a2048e07aadaa2dc934a2335525ba0a.tar.zst
nixpkgs-5b3290333a2048e07aadaa2dc934a2335525ba0a.zip
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
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/ocaml-modules/extlib/default.nix9
1 files changed, 8 insertions, 1 deletions
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;