From c459597ac0620939ee9debeea0bfb740168ae958 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 14 Nov 2024 21:22:42 +0100 Subject: [PATCH] coqPackages_8_16.coq-lsp: fix for recent findlib --- pkgs/development/coq-modules/coq-lsp/coq-loader.patch | 11 +++++++++++ pkgs/development/coq-modules/coq-lsp/default.nix | 2 ++ 2 files changed, 13 insertions(+) create mode 100644 pkgs/development/coq-modules/coq-lsp/coq-loader.patch diff --git a/pkgs/development/coq-modules/coq-lsp/coq-loader.patch b/pkgs/development/coq-modules/coq-lsp/coq-loader.patch new file mode 100644 index 000000000000..0bda42043afa --- /dev/null +++ b/pkgs/development/coq-modules/coq-lsp/coq-loader.patch @@ -0,0 +1,11 @@ +--- a/coq/loader.ml 2024-11-14 17:54:36.562137810 +0100 ++++ b/coq/loader.ml 2024-11-14 17:55:01.485154767 +0100 +@@ -81,7 +81,7 @@ + Exninfo.iraise iexn + + let plugin_handler user_loader = +- let loader = Option.default (Fl_dynload.load_packages ~debug:false) user_loader in ++ let loader = Option.default (Fl_dynload.load_packages ?loadfile:None ~debug:false) user_loader in + let safe_loader = safe_loader loader in + fun fl_pkg -> + let _, fl_pkg = Mltop.PluginSpec.repr fl_pkg in diff --git a/pkgs/development/coq-modules/coq-lsp/default.nix b/pkgs/development/coq-modules/coq-lsp/default.nix index c47cb75dda55..8103d28f86bd 100644 --- a/pkgs/development/coq-modules/coq-lsp/default.nix +++ b/pkgs/development/coq-modules/coq-lsp/default.nix @@ -49,4 +49,6 @@ else [ cmdliner ppx_deriving ppx_deriving_yojson ppx_import ppx_sexp_conv ppx_compare ppx_hash sexplib ]); + + patches = lib.optional (lib.versions.isEq "0.1.8" o.version) ./coq-loader.patch; })