From decad3f23c29fa7046da80fa3de5ec2af69dd639 Mon Sep 17 00:00:00 2001 From: Joscha Date: Mon, 27 Mar 2023 19:32:12 +0200 Subject: [PATCH 01/11] vscode-extensions.github: split up for consistency --- .../editors/vscode/extensions/default.nix | 90 +++++++++---------- 1 file changed, 44 insertions(+), 46 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index bf975ce68eba..3e3831ca59d4 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1257,59 +1257,57 @@ let }; }; - github = { - codespaces = buildVscodeMarketplaceExtension { - mktplcRef = { - publisher = "github"; - name = "codespaces"; - version = "1.14.1"; - sha256 = "sha256-oiAn/tW4jfccsY8zH6L7UzldeM7sV9tllSvgZD8c9aY="; - }; - meta = { license = lib.licenses.unfree; }; + github.codespaces = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "github"; + name = "codespaces"; + version = "1.14.1"; + sha256 = "sha256-oiAn/tW4jfccsY8zH6L7UzldeM7sV9tllSvgZD8c9aY="; }; + meta = { license = lib.licenses.unfree; }; + }; - copilot = buildVscodeMarketplaceExtension { - mktplcRef = { - publisher = "github"; - name = "copilot"; - version = "1.78.9758"; - sha256 = "sha256-qIaaM72SenMv+vtkTMBodD2JsroZLpw8qEttr5aIDQk="; - }; - meta = { - description = "GitHub Copilot uses OpenAI Codex to suggest code and entire functions in real-time right from your editor."; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=GitHub.copilot"; - homepage = "https://github.com/features/copilot"; - license = lib.licenses.unfree; - maintainers = [ lib.maintainers.Zimmi48 ]; - }; + github.copilot = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "github"; + name = "copilot"; + version = "1.78.9758"; + sha256 = "sha256-qIaaM72SenMv+vtkTMBodD2JsroZLpw8qEttr5aIDQk="; }; + meta = { + description = "GitHub Copilot uses OpenAI Codex to suggest code and entire functions in real-time right from your editor."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=GitHub.copilot"; + homepage = "https://github.com/features/copilot"; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.Zimmi48 ]; + }; + }; - github-vscode-theme = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "github-vscode-theme"; - publisher = "github"; - version = "6.3.3"; - sha256 = "sha256-fN9ljeZlbbSNW9qggLEz5HOLZlPhHmTHNi1VsZo7Uxk="; - }; - meta = { - description = "GitHub theme for VS Code"; - downloadPage = - "https://marketplace.visualstudio.com/items?itemName=GitHub.github-vscode-theme"; - homepage = "https://github.com/primer/github-vscode-theme"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.hugolgst ]; - }; + github.github-vscode-theme = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "github-vscode-theme"; + publisher = "github"; + version = "6.3.3"; + sha256 = "sha256-fN9ljeZlbbSNW9qggLEz5HOLZlPhHmTHNi1VsZo7Uxk="; }; + meta = { + description = "GitHub theme for VS Code"; + downloadPage = + "https://marketplace.visualstudio.com/items?itemName=GitHub.github-vscode-theme"; + homepage = "https://github.com/primer/github-vscode-theme"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.hugolgst ]; + }; + }; - vscode-pull-request-github = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "vscode-pull-request-github"; - publisher = "github"; - version = "0.61.2023032418"; - sha256 = "sha256-pCFq0lAMH3fno4/BtHJHhS4hX1KqxsPf4wEmAm66Y8E="; - }; - meta = { license = lib.licenses.mit; }; + github.vscode-pull-request-github = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-pull-request-github"; + publisher = "github"; + version = "0.61.2023032418"; + sha256 = "sha256-pCFq0lAMH3fno4/BtHJHhS4hX1KqxsPf4wEmAm66Y8E="; }; + meta = { license = lib.licenses.mit; }; }; gitlab.gitlab-workflow = buildVscodeMarketplaceExtension { From 09adaec7c13bfe06e22c0d151c2a72901585d13e Mon Sep 17 00:00:00 2001 From: Joscha Date: Mon, 27 Mar 2023 19:35:05 +0200 Subject: [PATCH 02/11] vscode-extensions.coenraads.bracket-pair-colorizer: remove The extension no longer exists on the marketplace. --- .../editors/vscode/extensions/default.nix | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 3e3831ca59d4..4c56d43c653b 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -634,23 +634,6 @@ let }; }; - coenraads.bracket-pair-colorizer = buildVscodeMarketplaceExtension { - meta = { - changelog = "https://marketplace.visualstudio.com/items/CoenraadS.bracket-pair-colorizer/changelog"; - description = "A customizable extension for colorizing matching brackets"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=CoenraadS.bracket-pair-colorizer"; - homepage = "https://github.com/CoenraadS/BracketPair"; - license = lib.licenses.mit; - maintainers = [ ]; - }; - mktplcRef = { - name = "bracket-pair-colorizer"; - publisher = "CoenraadS"; - version = "1.0.61"; - sha256 = "0r3bfp8kvhf9zpbiil7acx7zain26grk133f0r0syxqgml12i652"; - }; - }; - coenraads.bracket-pair-colorizer-2 = buildVscodeMarketplaceExtension { mktplcRef = { name = "bracket-pair-colorizer-2"; From 9c73895c06e460c4beaa9578e3a9136f737abfd8 Mon Sep 17 00:00:00 2001 From: Joscha Date: Mon, 27 Mar 2023 19:35:46 +0200 Subject: [PATCH 03/11] vscode-extensions.coenraads.bracket-pair-colorizer-2: remove The extension is deprecated as its functionality is now a native feature of VSCode. See also: https://marketplace.visualstudio.com/items?itemName=CoenraadS.bracket-pair-colorizer-2 --- .../editors/vscode/extensions/default.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 4c56d43c653b..1471c0a616e6 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -634,18 +634,6 @@ let }; }; - coenraads.bracket-pair-colorizer-2 = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "bracket-pair-colorizer-2"; - publisher = "CoenraadS"; - version = "0.2.2"; - sha256 = "0zcbs7h801agfs2cggk1cz8m8j0i2ypmgznkgw17lcx3zisll9ad"; - }; - meta = { - license = lib.licenses.mit; - }; - }; - colejcummins.llvm-syntax-highlighting = buildVscodeMarketplaceExtension { mktplcRef = { name = "llvm-syntax-highlighting"; From 359124ad033209aca919cc0fa51693cf42ea207f Mon Sep 17 00:00:00 2001 From: Joscha Date: Mon, 27 Mar 2023 19:38:54 +0200 Subject: [PATCH 04/11] vscode-extensions.faustinoaq.lex-flex-yacc-bison: remove The extension no longer exists on the marketplace. --- .../editors/vscode/extensions/default.nix | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 1471c0a616e6..555faf7ec9a7 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1051,23 +1051,6 @@ let }; }; - faustinoaq.lex-flex-yacc-bison = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "lex-flex-yacc-bison"; - publisher = "faustinoaq"; - version = "0.0.3"; - sha256 = "6254f52157dc796eae7bf135ac88c1c9cc19d884625331a1e634f9768722cc3d"; - }; - meta = { - changelog = "https://marketplace.visualstudio.com/items/faustinoaq.lex-flex-yacc-bison/changelog"; - description = "Language support for Lex, Flex, Yacc and Bison."; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=faustinoaq.lex-flex-yacc-bison"; - homepage = "https://github.com/faustinoaq/vscode-lex-flex-yacc-bison"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.emilytrau ]; - }; - }; - file-icons.file-icons = buildVscodeMarketplaceExtension { meta = { changelog = "https://marketplace.visualstudio.com/items/file-icons.file-icons/changelog"; From e8888cfda14e16c649cd6ab27d50df21c2c7f25a Mon Sep 17 00:00:00 2001 From: Joscha Date: Mon, 27 Mar 2023 19:40:09 +0200 Subject: [PATCH 05/11] vscode-extensions.msjsdiag.debugger-for-chrome: remove The extension is deprecated as VSCode now has its own debugger that covers the same functionality. See also: https://marketplace.visualstudio.com/items?itemName=msjsdiag.debugger-for-chrome --- .../editors/vscode/extensions/default.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 555faf7ec9a7..ece4db7e9b12 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2076,18 +2076,6 @@ let ms-vsliveshare.vsliveshare = callPackage ./ms-vsliveshare.vsliveshare { }; - msjsdiag.debugger-for-chrome = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "debugger-for-chrome"; - publisher = "msjsdiag"; - version = "4.12.11"; - sha256 = "sha256-9i3TgCFThnFF5ccwzS4ATj5c2Xoe/4tDFGv75jJxeQ4="; - }; - meta = { - license = lib.licenses.mit; - }; - }; - mskelton.one-dark-theme = buildVscodeMarketplaceExtension { mktplcRef = { name = "one-dark-theme"; From 4dcef4d9c91bd14990b154a4d52faf6fbfa66709 Mon Sep 17 00:00:00 2001 From: Joscha Date: Mon, 27 Mar 2023 19:42:23 +0200 Subject: [PATCH 06/11] vscode-extensions.silvenon.mdx: remove The extension is deprecated in favor of the official MDX extension at https://marketplace.visualstudio.com/items?itemName=unifiedjs.vscode-mdx See also: https://marketplace.visualstudio.com/items?itemName=silvenon.mdx --- .../editors/vscode/extensions/default.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index ece4db7e9b12..dd5fe68da373 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2486,18 +2486,6 @@ let }; }; - silvenon.mdx = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "mdx"; - publisher = "silvenon"; - version = "0.1.0"; - sha256 = "1mzsqgv0zdlj886kh1yx1zr966yc8hqwmiqrb1532xbmgyy6adz3"; - }; - meta = { - license = lib.licenses.mit; - }; - }; - skellock.just = buildVscodeMarketplaceExtension { mktplcRef = { name = "just"; From a761d073ca9caaf226125cab1cdad34c716c6e3d Mon Sep 17 00:00:00 2001 From: Joscha Date: Mon, 27 Mar 2023 19:58:36 +0200 Subject: [PATCH 07/11] vscode-extensions.jpoinssonnier.vscode-styled-components: move to styled-components.vscode-styled-components, 1.4.1 -> 1.7.6 According to the readme, the old location will no longer receive updates: https://github.com/styled-components/vscode-styled-components --- .../editors/vscode/extensions/default.nix | 29 +++++++++++-------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index dd5fe68da373..2a33974d6106 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1550,18 +1550,6 @@ let }; }; - jpoissonnier.vscode-styled-components = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "vscode-styled-components"; - publisher = "jpoissonnier"; - version = "1.4.1"; - sha256 = "sha256-ojbeuYBCS+DjF5R0aLuBImzoSOb8mXw1s0Uh0CzggzE="; - }; - meta = { - license = lib.licenses.mit; - }; - }; - justusadam.language-haskell = buildVscodeMarketplaceExtension { mktplcRef = { name = "language-haskell"; @@ -2616,6 +2604,22 @@ let }; }; + styled-components.vscode-styled-components = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-styled-components"; + publisher = "styled-components"; + version = "1.7.6"; + sha256 = "sha256-ZXXXFUriu//2Wmj1N+plj7xzJauGBfj+79SyrkUZAO4="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/styled-components.vscode-styled-components/changelog"; + description = "Syntax highlighting and IntelliSense for styled-components"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=styled-components.vscode-styled-components"; + homepage = "https://github.com/styled-components/vscode-styled-components"; + license = lib.licenses.mit; + }; + }; + sumneko.lua = callPackage ./sumneko.lua { }; svelte.svelte-vscode = buildVscodeMarketplaceExtension { @@ -3161,6 +3165,7 @@ let aliases = self: super: { # aliases jakebecker.elixir-ls = super.elixir-lsp.vscode-elixir-ls; + jpoissonnier.vscode-styled-components = super.styled-components.vscode-styled-components; ms-vscode = lib.recursiveUpdate super.ms-vscode { inherit (super.golang) go; }; _1Password = throw ''_1Password has been replaced with "1Password"''; _2gua = throw ''_2gua has been replaced with "2gua"''; From 32a11f9cf16c37f2b6d030447df253cafe5af7f5 Mon Sep 17 00:00:00 2001 From: Joscha Date: Mon, 27 Mar 2023 20:01:20 +0200 Subject: [PATCH 08/11] vscode-extensions.matklad.rust-analyzer: move to alias section --- pkgs/applications/editors/vscode/extensions/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 2a33974d6106..2c25798d9622 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1749,8 +1749,6 @@ let meta.license = lib.licenses.mit; }; - matklad.rust-analyzer = self.rust-lang.rust-analyzer; # Previous publisher - matthewpi.caddyfile-support = buildVscodeMarketplaceExtension { mktplcRef = { name = "caddyfile-support"; @@ -3166,6 +3164,7 @@ let # aliases jakebecker.elixir-ls = super.elixir-lsp.vscode-elixir-ls; jpoissonnier.vscode-styled-components = super.styled-components.vscode-styled-components; + matklad.rust-analyzer = super.rust-lang.rust-analyzer; # Previous publisher ms-vscode = lib.recursiveUpdate super.ms-vscode { inherit (super.golang) go; }; _1Password = throw ''_1Password has been replaced with "1Password"''; _2gua = throw ''_2gua has been replaced with "2gua"''; From 5cfaf84ab6266931c7a43c32c4ce7fda2ce53cfe Mon Sep 17 00:00:00 2001 From: Joscha Date: Mon, 27 Mar 2023 20:28:53 +0200 Subject: [PATCH 09/11] vscode-extensions: restore alphabetical order --- .../editors/vscode/extensions/default.nix | 228 +++++++++--------- 1 file changed, 114 insertions(+), 114 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 2c25798d9622..814ec75fb785 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -451,18 +451,6 @@ let }; }; - bodil.file-browser = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "file-browser"; - publisher = "bodil"; - version = "0.2.11"; - sha256 = "sha256-yPVhhsAUZxnlhj58fXkk+yhxop2q7YJ6X4W9dXGKJfo="; - }; - meta = { - license = lib.licenses.mit; - }; - }; - bierner.emojisense = buildVscodeMarketplaceExtension { mktplcRef = { name = "emojisense"; @@ -536,6 +524,18 @@ let }; }; + bodil.file-browser = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "file-browser"; + publisher = "bodil"; + version = "0.2.11"; + sha256 = "sha256-yPVhhsAUZxnlhj58fXkk+yhxop2q7YJ6X4W9dXGKJfo="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + bradlc.vscode-tailwindcss = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-tailwindcss"; @@ -594,6 +594,23 @@ let chenglou92.rescript-vscode = callPackage ./chenglou92.rescript-vscode { }; + chris-hayes.chatgpt-reborn = buildVscodeMarketplaceExtension { + meta = { + changelog = "https://marketplace.visualstudio.com/items/chris-hayes.chatgpt-reborn/changelog"; + description = "A Visual Studio Code extension to support ChatGPT, GPT-3 and Codex conversations"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=chris-hayes.chatgpt-reborn"; + homepage = "https://github.com/christopher-hayes/vscode-chatgpt-reborn"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.drupol ]; + }; + mktplcRef = { + name = "chatgpt-reborn"; + publisher = "chris-hayes"; + version = "3.11.2"; + sha256 = "sha256-YidcekYTgPYlzfmDHHAxywF+bJE8Da3pg/TCumK4Epo="; + }; + }; + christian-kohler.path-intellisense = buildVscodeMarketplaceExtension { mktplcRef = { name = "path-intellisense"; @@ -663,23 +680,6 @@ let }; }; - chris-hayes.chatgpt-reborn = buildVscodeMarketplaceExtension { - meta = { - changelog = "https://marketplace.visualstudio.com/items/chris-hayes.chatgpt-reborn/changelog"; - description = "A Visual Studio Code extension to support ChatGPT, GPT-3 and Codex conversations"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=chris-hayes.chatgpt-reborn"; - homepage = "https://github.com/christopher-hayes/vscode-chatgpt-reborn"; - license = lib.licenses.isc; - maintainers = [ lib.maintainers.drupol ]; - }; - mktplcRef = { - name = "chatgpt-reborn"; - publisher = "chris-hayes"; - version = "3.11.2"; - sha256 = "sha256-YidcekYTgPYlzfmDHHAxywF+bJE8Da3pg/TCumK4Epo="; - }; - }; - cweijan.vscode-database-client2 = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-database-client2"; @@ -1928,6 +1928,56 @@ let }; }; + ms-toolsai.jupyter = callPackage ./ms-toolsai.jupyter { }; + + ms-toolsai.jupyter-keymap = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "jupyter-keymap"; + publisher = "ms-toolsai"; + version = "1.1.0"; + sha256 = "sha256-krDtR+ZJiJf1Kxcu5mdXOaSAiJb2bXC1H0XWWviWeMQ="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + + ms-toolsai.jupyter-renderers = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "jupyter-renderers"; + publisher = "ms-toolsai"; + version = "1.0.15"; + sha256 = "sha256-JR6PunvRRTsSqjSGGAn/1t1B+Ia6X0MgqahehcuSNYA="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + + ms-toolsai.vscode-jupyter-cell-tags = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-jupyter-cell-tags"; + publisher = "ms-toolsai"; + version = "0.1.8"; + sha256 = "sha256-0oPyptnUWL1h/H13SdR+FdgGzVwEpTaK9SCE7BvI/5M="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + + ms-toolsai.vscode-jupyter-slideshow = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-jupyter-slideshow"; + publisher = "ms-toolsai"; + version = "0.1.5"; + sha256 = "1p6r5vkzvwvxif3wxqi9599vplabzig27fzzz0bx9z0awfglzyi7"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + ms-vscode.anycode = buildVscodeMarketplaceExtension { mktplcRef = { name = "anycode"; @@ -1992,8 +2042,6 @@ let }; }; - ms-vscode-remote.remote-ssh = callPackage ./ms-vscode-remote.remote-ssh { }; - ms-vscode.theme-tomorrowkit = buildVscodeMarketplaceExtension { mktplcRef = { name = "Theme-TomorrowKit"; @@ -2010,55 +2058,7 @@ let }; }; - ms-toolsai.jupyter = callPackage ./ms-toolsai.jupyter { }; - - ms-toolsai.jupyter-keymap = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "jupyter-keymap"; - publisher = "ms-toolsai"; - version = "1.1.0"; - sha256 = "sha256-krDtR+ZJiJf1Kxcu5mdXOaSAiJb2bXC1H0XWWviWeMQ="; - }; - meta = { - license = lib.licenses.mit; - }; - }; - - ms-toolsai.jupyter-renderers = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "jupyter-renderers"; - publisher = "ms-toolsai"; - version = "1.0.15"; - sha256 = "sha256-JR6PunvRRTsSqjSGGAn/1t1B+Ia6X0MgqahehcuSNYA="; - }; - meta = { - license = lib.licenses.mit; - }; - }; - - ms-toolsai.vscode-jupyter-cell-tags = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "vscode-jupyter-cell-tags"; - publisher = "ms-toolsai"; - version = "0.1.8"; - sha256 = "sha256-0oPyptnUWL1h/H13SdR+FdgGzVwEpTaK9SCE7BvI/5M="; - }; - meta = { - license = lib.licenses.mit; - }; - }; - - ms-toolsai.vscode-jupyter-slideshow = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "vscode-jupyter-slideshow"; - publisher = "ms-toolsai"; - version = "0.1.5"; - sha256 = "1p6r5vkzvwvxif3wxqi9599vplabzig27fzzz0bx9z0awfglzyi7"; - }; - meta = { - license = lib.licenses.mit; - }; - }; + ms-vscode-remote.remote-ssh = callPackage ./ms-vscode-remote.remote-ssh { }; ms-vsliveshare.vsliveshare = callPackage ./ms-vsliveshare.vsliveshare { }; @@ -2137,6 +2137,18 @@ let }; }; + octref.vetur = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vetur"; + publisher = "octref"; + version = "0.37.3"; + sha256 = "sha256-3hi1LOZto5AYaomB9ihkAt4j/mhkCDJ8Jqa16piwHIQ="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + oderwat.indent-rainbow = buildVscodeMarketplaceExtension { mktplcRef = { name = "indent-rainbow"; @@ -2153,18 +2165,6 @@ let }; }; - octref.vetur = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "vetur"; - publisher = "octref"; - version = "0.37.3"; - sha256 = "sha256-3hi1LOZto5AYaomB9ihkAt4j/mhkCDJ8Jqa16piwHIQ="; - }; - meta = { - license = lib.licenses.mit; - }; - }; - phoenixframework.phoenix = buildVscodeMarketplaceExtension { mktplcRef = { name = "phoenix"; @@ -2263,6 +2263,16 @@ let }; }; + redhat.vscode-xml = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-xml"; + publisher = "redhat"; + version = "0.25.2023032304"; + sha256 = "sha256-3hU/MZU9dP91p2PVycFL6yg/nf4/x8tt76vmlkiHnE8="; + }; + meta.license = lib.licenses.epl20; + }; + redhat.vscode-yaml = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-yaml"; @@ -2275,16 +2285,6 @@ let }; }; - redhat.vscode-xml = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "vscode-xml"; - publisher = "redhat"; - version = "0.25.2023032304"; - sha256 = "sha256-3hU/MZU9dP91p2PVycFL6yg/nf4/x8tt76vmlkiHnE8="; - }; - meta.license = lib.licenses.epl20; - }; - richie5um2.snake-trail = buildVscodeMarketplaceExtension { mktplcRef = { name = "snake-trail"; @@ -2333,18 +2333,6 @@ let }; }; - rubymaniac.vscode-paste-and-indent = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "vscode-paste-and-indent"; - publisher = "Rubymaniac"; - version = "0.0.8"; - sha256 = "0fqwcvwq37ndms6vky8jjv0zliy6fpfkh8d9raq8hkinfxq6klgl"; - }; - meta = { - license = lib.licenses.mit; - }; - }; - rubbersheep.gi = buildVscodeMarketplaceExtension { mktplcRef = { name = "gi"; @@ -2357,6 +2345,18 @@ let }; }; + rubymaniac.vscode-paste-and-indent = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-paste-and-indent"; + publisher = "Rubymaniac"; + version = "0.0.8"; + sha256 = "0fqwcvwq37ndms6vky8jjv0zliy6fpfkh8d9raq8hkinfxq6klgl"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + rust-lang.rust-analyzer = callPackage ./rust-lang.rust-analyzer { }; ryu1kn.partial-diff = buildVscodeMarketplaceExtension { From c7f5ccaef9fb0bcb992797a88b9811d090aff14f Mon Sep 17 00:00:00 2001 From: Joscha Date: Mon, 27 Mar 2023 22:18:21 +0200 Subject: [PATCH 10/11] vscode-extensions: lowercase remaining extension names In practice, the vast majority of extensions with uppercase characters in their extension identifiers was already using lowercased versions of the identifiers as names. This commit documents this practice and converts the four remaining extensions. --- .../editors/vscode/extensions/default.nix | 31 ++++++++++++------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 814ec75fb785..282b2800ec75 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -25,11 +25,13 @@ let inherit (vscode-utils) buildVscodeMarketplaceExtension; # - # Unless there is a good reason not to, we attempt to use the same name as the - # extension's unique identifier (the name the extension gets when installed - # from vscode under `~/.vscode`) and found on the marketplace extension page. - # So an extension's attribute name should be of the form: - # "${mktplcRef.publisher}.${mktplcRef.name}". + # Unless there is a good reason not to, we attempt to use the lowercase + # version of the extension's unique identifier. The unique identifier can be + # found on the marketplace extension page, and is the name under which the + # extension is installed by VSCode under `~/.vscode`. + # + # This means an extension should be located at + # ${lib.strings.toLower mktplcRef.publisher}.${lib.string.toLower mktplcRef.name} # baseExtensions = self: lib.mapAttrs (_n: lib.recurseIntoAttrs) { @@ -253,7 +255,7 @@ let }; }; - Arjun.swagger-viewer = buildVscodeMarketplaceExtension { + arjun.swagger-viewer = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "Arjun"; name = "swagger-viewer"; @@ -2026,7 +2028,7 @@ let }; }; - ms-vscode.PowerShell = buildVscodeMarketplaceExtension { + ms-vscode.powershell = buildVscodeMarketplaceExtension { mktplcRef = { name = "PowerShell"; publisher = "ms-vscode"; @@ -2297,7 +2299,7 @@ let }; }; - rioj7.commandOnAllFiles = buildVscodeMarketplaceExtension { + rioj7.commandonallfiles = buildVscodeMarketplaceExtension { mktplcRef = { name = "commandOnAllFiles"; publisher = "rioj7"; @@ -3028,7 +3030,7 @@ let }; }; - WakaTime.vscode-wakatime = callPackage ./WakaTime.vscode-wakatime { }; + wakatime.vscode-wakatime = callPackage ./WakaTime.vscode-wakatime { }; wholroyd.jinja = buildVscodeMarketplaceExtension { mktplcRef = { @@ -3161,11 +3163,18 @@ let }; aliases = self: super: { - # aliases + Arjun.swagger-viewer = super.arjun.swagger-viewer; jakebecker.elixir-ls = super.elixir-lsp.vscode-elixir-ls; jpoissonnier.vscode-styled-components = super.styled-components.vscode-styled-components; matklad.rust-analyzer = super.rust-lang.rust-analyzer; # Previous publisher - ms-vscode = lib.recursiveUpdate super.ms-vscode { inherit (super.golang) go; }; + ms-vscode = lib.recursiveUpdate super.ms-vscode { + go = super.golang.go; + PowerShell = super.ms-vscode.powershell; + }; + rioj7 = lib.recursiveUpdate super.rioj7 { + commandOnAllFiles = super.rioj7.commandonallfiles; + }; + WakaTime.vscode-wakatime = super.wakatime.vscode-wakatime; _1Password = throw ''_1Password has been replaced with "1Password"''; _2gua = throw ''_2gua has been replaced with "2gua"''; _4ops = throw ''_4ops has been replaced with "4ops"''; From 11df65743da95d6153c6c048dbc9596e47871fa6 Mon Sep 17 00:00:00 2001 From: Joscha Date: Mon, 27 Mar 2023 22:36:23 +0200 Subject: [PATCH 11/11] vscode-extensions: simplify how aliases are specified --- .../editors/vscode/extensions/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 282b2800ec75..40ff07c7d4fc 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3162,18 +3162,14 @@ let }; }; - aliases = self: super: { + aliases = super: { Arjun.swagger-viewer = super.arjun.swagger-viewer; jakebecker.elixir-ls = super.elixir-lsp.vscode-elixir-ls; jpoissonnier.vscode-styled-components = super.styled-components.vscode-styled-components; matklad.rust-analyzer = super.rust-lang.rust-analyzer; # Previous publisher - ms-vscode = lib.recursiveUpdate super.ms-vscode { - go = super.golang.go; - PowerShell = super.ms-vscode.powershell; - }; - rioj7 = lib.recursiveUpdate super.rioj7 { - commandOnAllFiles = super.rioj7.commandonallfiles; - }; + ms-vscode.go = super.golang.go; + ms-vscode.PowerShell = super.ms-vscode.powershell; + rioj7.commandOnAllFiles = super.rioj7.commandonallfiles; WakaTime.vscode-wakatime = super.wakatime.vscode-wakatime; _1Password = throw ''_1Password has been replaced with "1Password"''; _2gua = throw ''_2gua has been replaced with "2gua"''; @@ -3184,7 +3180,9 @@ let # then apply extension specific modifcations to packages. # overlays will be applied left to right, overrides should come after aliases. - overlays = lib.optionals config.allowAliases [ aliases ]; + overlays = lib.optionals config.allowAliases [ + (self: super: lib.recursiveUpdate super (aliases super)) + ]; toFix = lib.foldl' (lib.flip lib.extends) baseExtensions overlays; in