From 682f958f762d767670b1cdbc5a5f3f6a1d1de57a Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Fri, 23 Feb 2024 22:08:42 +0100 Subject: [PATCH 1/2] vscode-extensions.equinusocio.vsc-material-theme: 33.8.0 -> 34.3.1 --- .../editors/vscode/extensions/default.nix | 17 +-------------- .../default.nix | 21 +++++++++++++++++++ 2 files changed, 22 insertions(+), 16 deletions(-) create mode 100644 pkgs/applications/editors/vscode/extensions/equinusocio.vsc-material-theme/default.nix diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index b0196c29b133..ef9280b4f9e0 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1474,22 +1474,7 @@ let }; }; - equinusocio.vsc-material-theme = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "vsc-material-theme"; - publisher = "Equinusocio"; - version = "33.8.0"; - sha256 = "sha256-+I4AUwsrElT62XNvmuAC2iBfHfjNYY0bmAqzQvfwUYM="; - }; - meta = { - changelog = "https://marketplace.visualstudio.com/items/Equinusocio.vsc-material-theme/changelog"; - description = "The most epic theme now for Visual Studio Code"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=Equinusocio.vsc-material-theme"; - homepage = "https://github.com/material-theme/vsc-material-theme"; - license = lib.licenses.asl20; - maintainers = [ lib.maintainers.stunkymonkey ]; - }; - }; + equinusocio.vsc-material-theme = callPackage ./equinusocio.vsc-material-theme { }; esbenp.prettier-vscode = buildVscodeMarketplaceExtension { mktplcRef = { diff --git a/pkgs/applications/editors/vscode/extensions/equinusocio.vsc-material-theme/default.nix b/pkgs/applications/editors/vscode/extensions/equinusocio.vsc-material-theme/default.nix new file mode 100644 index 000000000000..016203a9452f --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/equinusocio.vsc-material-theme/default.nix @@ -0,0 +1,21 @@ +{ lib +, vscode-utils +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vsc-material-theme"; + publisher = "Equinusocio"; + version = "34.3.1"; + sha256 = "sha256-3yxFTMtjJR1b4EzBDfm55HF9chrya5OUF5wN+KHEduE="; + }; + + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/Equinusocio.vsc-material-theme/changelog"; + description = "The most epic theme now for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=Equinusocio.vsc-material-theme"; + homepage = "https://github.com/material-theme/vsc-material-theme"; + license = licenses.asl20; + maintainers = with maintainers; [ stunkymonkey ]; + }; +} From a00e878cb349df2837f4c746f61aeb5ddf4905ca Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Fri, 23 Feb 2024 22:09:08 +0100 Subject: [PATCH 2/2] vscode-extensions.equinusocio.vsc-material-theme: fix user-settings --- .../extensions/equinusocio.vsc-material-theme/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/equinusocio.vsc-material-theme/default.nix b/pkgs/applications/editors/vscode/extensions/equinusocio.vsc-material-theme/default.nix index 016203a9452f..8f2784c3704d 100644 --- a/pkgs/applications/editors/vscode/extensions/equinusocio.vsc-material-theme/default.nix +++ b/pkgs/applications/editors/vscode/extensions/equinusocio.vsc-material-theme/default.nix @@ -10,6 +10,12 @@ vscode-utils.buildVscodeMarketplaceExtension { sha256 = "sha256-3yxFTMtjJR1b4EzBDfm55HF9chrya5OUF5wN+KHEduE="; }; + # extensions wants to write at the /nix/store path, so we patch it to use the globalStorageUri instead. + prePatch = '' + substituteInPlace ./build/core/extension-manager.js \ + --replace-fail "path_1.posix.join(extensionFolderUri.path, env_1.USER_CONFIG_FILE_NAME)" "path_1.posix.join(ExtensionContext.globalStorageUri.fsPath, env_1.USER_CONFIG_FILE_NAME)" + ''; + meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/Equinusocio.vsc-material-theme/changelog"; description = "The most epic theme now for Visual Studio Code";