From bb97d11d77afbeba2d8f80dfb418ec5a66103db5 Mon Sep 17 00:00:00 2001 From: chn Date: Tue, 20 May 2025 10:35:59 +0800 Subject: [PATCH] modules.packages.vscode: fix --- modules/packages/vscode.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/modules/packages/vscode.nix b/modules/packages/vscode.nix index 00d3c624..4a4fe9f8 100644 --- a/modules/packages/vscode.nix +++ b/modules/packages/vscode.nix @@ -18,9 +18,15 @@ inputs: (set: { name = set; - value = vscode-extensions.${set} or {} - // nix-vscode-extensions.vscode-marketplace.${set} - // nix-vscode-extensions.vscode-marketplace-release.${set} or {}; + value = + # provided by nixpkgs + vscode-extensions.${set} or {} + # provided by nix-vscode-extensions, including pre-release versions, but prefer stable version + // nix-vscode-extensions.vscode-marketplace.${set} or {} + // nix-vscode-extensions.vscode-marketplace-release.${set} or {} + # some versions are too high for the current vscode, use old version from here to override it + // (nix-vscode-extensions.forVSCodeVersion inputs.pkgs.vscode.version) + .vscode-marketplace-release.${set} or {}; }) (inputs.lib.unique (