From b1c1948a0d8d2f44c23a58d74b015e59b7ece36a Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 15 May 2025 17:07:29 +0200 Subject: [PATCH 1/2] vscode-extensions.esbenp.prettier-vscode: refactor, move into its own directory, provide default working configuration --- .../editors/vscode/extensions/default.nix | 17 +-------- .../esbenp.prettier-vscode/default.nix | 37 +++++++++++++++++++ 2 files changed, 38 insertions(+), 16 deletions(-) create mode 100644 pkgs/applications/editors/vscode/extensions/esbenp.prettier-vscode/default.nix diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 81ee790ab649..cc9b7389a565 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1789,22 +1789,7 @@ let }; }; - esbenp.prettier-vscode = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "prettier-vscode"; - publisher = "esbenp"; - version = "11.0.0"; - hash = "sha256-pNjkJhof19cuK0PsXJ/Q/Zb2H7eoIkfXJMLZJ4lDn7k="; - }; - meta = { - changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog"; - description = "Code formatter using prettier"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode"; - homepage = "https://github.com/prettier/prettier-vscode"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.datafoo ]; - }; - }; + esbenp.prettier-vscode = callPackage ./esbenp.prettier-vscode { }; ethansk.restore-terminals = buildVscodeMarketplaceExtension { mktplcRef = { diff --git a/pkgs/applications/editors/vscode/extensions/esbenp.prettier-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/esbenp.prettier-vscode/default.nix new file mode 100644 index 000000000000..8304dd57ee0e --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/esbenp.prettier-vscode/default.nix @@ -0,0 +1,37 @@ +{ + jq, + lib, + moreutils, + vscode-utils, + nodePackages, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "prettier-vscode"; + publisher = "esbenp"; + version = "11.0.0"; + hash = "sha256-pNjkJhof19cuK0PsXJ/Q/Zb2H7eoIkfXJMLZJ4lDn7k="; + }; + + nativeBuildInputs = [ + jq + moreutils + ]; + + buildInputs = [ nodePackages.prettier ]; + + postInstall = '' + cd "$out/$installPrefix" + jq '.contributes.configuration.properties."prettier.prettierPath".default = "${nodePackages.prettier}/lib/node_modules/prettier"' package.json | sponge package.json + ''; + + meta = { + changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog"; + description = "Code formatter using prettier"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode"; + homepage = "https://github.com/prettier/prettier-vscode"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.datafoo ]; + }; +} From a6049de7ae0b322214979d2368afcf99bcf2c87e Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 15 May 2025 17:45:35 +0200 Subject: [PATCH 2/2] =?UTF-8?q?vscode-extensions.dbaeumer.vscode-eslint:?= =?UTF-8?q?=20refactor,=20move=20into=20its=20own=20directory,=20provide?= =?UTF-8?q?=20default=20working=20configuration=20=E2=94=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dbaeumer.vscode-eslint/default.nix | 37 +++++++++++++++++++ .../editors/vscode/extensions/default.nix | 17 +-------- 2 files changed, 38 insertions(+), 16 deletions(-) create mode 100644 pkgs/applications/editors/vscode/extensions/dbaeumer.vscode-eslint/default.nix diff --git a/pkgs/applications/editors/vscode/extensions/dbaeumer.vscode-eslint/default.nix b/pkgs/applications/editors/vscode/extensions/dbaeumer.vscode-eslint/default.nix new file mode 100644 index 000000000000..1e4a7d7069a1 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/dbaeumer.vscode-eslint/default.nix @@ -0,0 +1,37 @@ +{ + jq, + lib, + moreutils, + vscode-utils, + eslint, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-eslint"; + publisher = "dbaeumer"; + version = "3.0.13"; + hash = "sha256-l5VvhQPxPaQsPhXUbFW2yGJjaqnNvijn4QkXPjf1WXo="; + }; + + nativeBuildInputs = [ + jq + moreutils + ]; + + buildInputs = [ eslint ]; + + postInstall = '' + cd "$out/$installPrefix" + jq '.contributes.configuration.properties."eslint.nodePath".default = "${eslint}/lib/node_modules"' package.json | sponge package.json + ''; + + meta = { + changelog = "https://marketplace.visualstudio.com/items/dbaeumer.vscode-eslint/changelog"; + description = "Integrates ESLint JavaScript into VS Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint"; + homepage = "https://github.com/Microsoft/vscode-eslint"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.datafoo ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index cc9b7389a565..9a15e1dd2f11 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1308,22 +1308,7 @@ let }; }; - dbaeumer.vscode-eslint = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "vscode-eslint"; - publisher = "dbaeumer"; - version = "3.0.13"; - hash = "sha256-l5VvhQPxPaQsPhXUbFW2yGJjaqnNvijn4QkXPjf1WXo="; - }; - meta = { - changelog = "https://marketplace.visualstudio.com/items/dbaeumer.vscode-eslint/changelog"; - description = "Integrates ESLint JavaScript into VS Code"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint"; - homepage = "https://github.com/Microsoft/vscode-eslint"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.datafoo ]; - }; - }; + dbaeumer.vscode-eslint = callPackage ./dbaeumer.vscode-eslint { }; dendron.adjust-heading-level = callPackage ./dendron.adjust-heading-level { };