From 4fe36bc26de66f9c8cb9299a710bdfacd4b59e17 Mon Sep 17 00:00:00 2001 From: Olivier Nicole Date: Tue, 30 Jun 2026 15:15:24 +0200 Subject: [PATCH] ocamlPackages.{vscoq,vsrocq}-language-server: use yojson 3.0.0 Remove the ppx_yojson_conv_lib.override { yojson = yojson_2; } workaround now that lsp and jsonrpc build against yojson 3.0.0 directly. Assisted-By: Claude Sonnet 4.6 --- .../rocq-modules/vscoq-language-server/default.nix | 4 +--- .../rocq-modules/vsrocq-language-server/default.nix | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/rocq-modules/vscoq-language-server/default.nix b/pkgs/development/rocq-modules/vscoq-language-server/default.nix index af1106de9f03..e20c956507bb 100644 --- a/pkgs/development/rocq-modules/vscoq-language-server/default.nix +++ b/pkgs/development/rocq-modules/vscoq-language-server/default.nix @@ -67,9 +67,7 @@ ocamlPackages.buildDunePackage { ppx_deriving ppx_import sexplib - (ppx_yojson_conv.override { - ppx_yojson_conv_lib = ppx_yojson_conv_lib.override { yojson = yojson_2; }; - }) + ppx_yojson_conv lsp sel ppx_optcomp diff --git a/pkgs/development/rocq-modules/vsrocq-language-server/default.nix b/pkgs/development/rocq-modules/vsrocq-language-server/default.nix index b65295d03b47..8818677795b6 100644 --- a/pkgs/development/rocq-modules/vsrocq-language-server/default.nix +++ b/pkgs/development/rocq-modules/vsrocq-language-server/default.nix @@ -58,9 +58,7 @@ ocamlPackages.buildDunePackage { ppx_deriving ppx_import sexplib - (ppx_yojson_conv.override { - ppx_yojson_conv_lib = ppx_yojson_conv_lib.override { yojson = yojson_2; }; - }) + ppx_yojson_conv lsp sel ppx_optcomp