From e6b89d18493ba565706b1d501951e82f4fbdd16f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Fri, 9 Jan 2026 15:25:56 +0100 Subject: [PATCH 1/4] rocqPackages.vsrocq-language-server: 2.3.3 -> 2.3.4 Catch up with update of VS Code extension already done in #467514. --- pkgs/applications/editors/vscode/extensions/default.nix | 1 + .../rocq-modules/vsrocq-language-server/default.nix | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index dff3b671517b..f44580b09b73 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3939,6 +3939,7 @@ let mktplcRef = { publisher = "rocq-prover"; name = "vsrocq"; + # When updating the version here, also update the language server vsrocq-language-server version = "2.3.4"; hash = "sha256-2zYoCUtyhboQt68UJEmWOvrTrIOV2QmpaXU5mUhJfsA="; }; diff --git a/pkgs/development/rocq-modules/vsrocq-language-server/default.nix b/pkgs/development/rocq-modules/vsrocq-language-server/default.nix index aad1e3efecf7..cca7484e7d46 100644 --- a/pkgs/development/rocq-modules/vsrocq-language-server/default.nix +++ b/pkgs/development/rocq-modules/vsrocq-language-server/default.nix @@ -16,8 +16,8 @@ let case = case: out: { inherit case out; }; in lib.switch rocq-core.rocq-version [ - (case (lib.versions.range "8.18" "9.1") "2.3.3") - (case (lib.versions.range "8.18" "9.1") "2.3.0") + # When updating the default version here, also update the VsRocq VS Code extension + (case (lib.versions.range "8.18" "9.1") "2.3.4") ] null; location = { domain = "github.com"; @@ -29,6 +29,8 @@ let release."2.3.0".sha256 = "sha256-BZLxcCmSGFf04eUmlJXnyxmg4hTwpFaPaIik4VD444M="; release."2.3.3".rev = "v2.3.3"; release."2.3.3".sha256 = "sha256-wgn28wqWhZS4UOLUblkgXQISgLV+XdSIIEMx9uMT/ig="; + release."2.3.4".rev = "v2.3.4"; + release."2.3.4".sha256 = "sha256-v1hQjE8U1o2VYOlUjH0seIsNG+NrMNZ8ixt4bQNyGvI="; inherit location; }; fetched = fetch (if version != null then version else defaultVersion); From b180c430efd4ee39ab02d4578d35bc83da6b03ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Fri, 9 Jan 2026 15:35:59 +0100 Subject: [PATCH 2/4] Revert "coqPackages.vscoq-language-server: 2.2.6 -> 2.3.3" This reverts commit d03b7559109c72a9342bddfe4c70b1c1b77087f4. This update did not make sense as the package changed name, and this resulted in a broken vscoq-language-server package, providing no binaries. --- .../development/coq-modules/vscoq-language-server/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/coq-modules/vscoq-language-server/default.nix b/pkgs/development/coq-modules/vscoq-language-server/default.nix index 02527cb467e5..3941948d5884 100644 --- a/pkgs/development/coq-modules/vscoq-language-server/default.nix +++ b/pkgs/development/coq-modules/vscoq-language-server/default.nix @@ -16,7 +16,6 @@ let in with lib.versions; lib.switch coq.coq-version [ - (case (range "8.18" "9.1") "2.3.3") (case (range "8.18" "9.1") "2.2.6") (case (range "8.18" "8.20") "2.2.1") (case (range "8.18" "8.19") "2.1.2") @@ -42,8 +41,7 @@ let release."2.2.5".sha256 = "sha256-XyIjwem/yS7UIpQATNixgKkrMOHHs74nkAOvpU5WG1k="; release."2.2.6".rev = "v2.2.6"; release."2.2.6".sha256 = "sha256-J8nRTAwN6GBEYgqlXa2kkkrHPatXsSObQg9QUQoZhgE="; - release."2.3.3".rev = "v2.3.3"; - release."2.3.3".sha256 = "sha256-wgn28wqWhZS4UOLUblkgXQISgLV+XdSIIEMx9uMT/ig="; + # This is the last version of VsCoq. Now, new versions are for VsRocq. inherit location; }; fetched = fetch (if version != null then version else defaultVersion); From e595314e091254a4a85962049cb4e2f096e89605 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Fri, 9 Jan 2026 15:25:56 +0100 Subject: [PATCH 3/4] coqPackages.vscoq-language-server: update URL of repository --- .../coq-modules/vscoq-language-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/coq-modules/vscoq-language-server/default.nix b/pkgs/development/coq-modules/vscoq-language-server/default.nix index 3941948d5884..b20d6961eb7a 100644 --- a/pkgs/development/coq-modules/vscoq-language-server/default.nix +++ b/pkgs/development/coq-modules/vscoq-language-server/default.nix @@ -23,8 +23,8 @@ let ] null; location = { domain = "github.com"; - owner = "coq-community"; - repo = "vscoq"; + owner = "rocq-prover"; + repo = "vsrocq"; }; fetch = metaFetch { release."2.0.3+coq8.18".sha256 = "sha256-VXhHCP6Ni5/OcsgoI1EbJfYCpXzwkuR8kbbKrl6dfjU="; @@ -77,7 +77,7 @@ ocamlPackages.buildDunePackage { meta = { description = "Language server for the vscoq vscode/codium extension"; - homepage = "https://github.com/coq-community/vscoq"; + homepage = "https://github.com/rocq-prover/vsrocq"; maintainers = with lib.maintainers; [ cohencyril ]; license = lib.licenses.mit; } From 3fafa51bffe5f20f80705b926b512a2c22e07236 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Fri, 9 Jan 2026 15:25:56 +0100 Subject: [PATCH 4/4] coqPackages.vsrocq-language-server: init at 2.3.4 There is no reason not to provide vsrocq-language-server through coqPackages. In fact, following the logic that only packages that do not depend on Coq belong to rocqPackages, it should not even have been in rocqPackages in the first place. --- pkgs/development/rocq-modules/vsrocq-language-server/default.nix | 1 - pkgs/top-level/coq-packages.nix | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/rocq-modules/vsrocq-language-server/default.nix b/pkgs/development/rocq-modules/vsrocq-language-server/default.nix index cca7484e7d46..d5965f8a4e7e 100644 --- a/pkgs/development/rocq-modules/vsrocq-language-server/default.nix +++ b/pkgs/development/rocq-modules/vsrocq-language-server/default.nix @@ -74,7 +74,6 @@ ocamlPackages.buildDunePackage { license = lib.licenses.mit; } // lib.optionalAttrs (fetched.broken or false) { - rocqFilter = true; broken = true; }; } diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 8a35e3a59feb..70fa9d0730b4 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -222,6 +222,7 @@ let Vpl = callPackage ../development/coq-modules/Vpl { }; VplTactic = callPackage ../development/coq-modules/VplTactic { }; vscoq-language-server = callPackage ../development/coq-modules/vscoq-language-server { }; + vsrocq-language-server = callPackage ../development/rocq-modules/vsrocq-language-server { }; VST = callPackage ../development/coq-modules/VST ( (lib.optionalAttrs (lib.versionAtLeast self.coq.version "8.14") { compcert = self.compcert.override {