From 11df65743da95d6153c6c048dbc9596e47871fa6 Mon Sep 17 00:00:00 2001 From: Joscha Date: Mon, 27 Mar 2023 22:36:23 +0200 Subject: [PATCH] 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