3
0
Fork 0
forked from mirrors/nixpkgs

vscode-extensions: fix aliases

This commit is contained in:
Jonathan Ringer 2020-11-24 11:03:58 -08:00 committed by Jonathan Ringer
parent 83b309f657
commit bd11afec4f

View file

@ -10,7 +10,7 @@ let
# So an extension's attribute name should be of the form: # So an extension's attribute name should be of the form:
# "${mktplcRef.publisher}.${mktplcRef.name}". # "${mktplcRef.publisher}.${mktplcRef.name}".
# #
self = stdenv.lib.mapAttrs (_n: stdenv.lib.recurseIntoAttrs) baseExtensions = self: stdenv.lib.mapAttrs (_n: stdenv.lib.recurseIntoAttrs)
{ {
alanz.vscode-hie-server = buildVscodeMarketplaceExtension { alanz.vscode-hie-server = buildVscodeMarketplaceExtension {
@ -245,11 +245,19 @@ let
llvm-org.lldb-vscode = llvmPackages_8.lldb; llvm-org.lldb-vscode = llvmPackages_8.lldb;
WakaTime.vscode-wakatime = callPackage ./wakatime {}; WakaTime.vscode-wakatime = callPackage ./wakatime {};
} // lib.optionalAttrs (config.allowAliases or true) ( };
with self; {
aliases = self: super: {
# aliases # aliases
ms-vscode.Go = golang.Go; ms-vscode = lib.recursiveUpdate super.ms-vscode { inherit (super.golang) Go; };
} };
);
# TODO: add overrides overlay, so that we can have a generated.nix
# then apply extension specific modifcations to packages.
# overlays will be applied left to right, overrides should come after aliases.
overlays = lib.optionals (config.allowAliases or true) [ aliases ];
toFix = lib.foldl' (lib.flip lib.extends) baseExtensions overlays;
in in
self lib.fix toFix