Merge pull request #182090 from ncfavier/vscode-extension-attrs

vscode-extensions: properly split marketplace ref attributes
This commit is contained in:
SuperHeroINTJ 2022-07-20 17:22:31 -03:00 committed by GitHub
commit 4199a5fab9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -43,7 +43,7 @@ let
});
fetchVsixFromVscodeMarketplace = mktplcExtRef:
fetchurl((import ./mktplcExtRefToFetchArgs.nix mktplcExtRef));
fetchurl (import ./mktplcExtRefToFetchArgs.nix mktplcExtRef);
buildVscodeMarketplaceExtension = a@{
name ? "",
@ -65,11 +65,12 @@ let
"publisher"
"version"
"sha256"
"arch"
];
mktplcExtRefToExtDrv = ext:
buildVscodeMarketplaceExtension ((removeAttrs ext mktplcRefAttrList) // {
mktplcRef = ext;
buildVscodeMarketplaceExtension (removeAttrs ext mktplcRefAttrList // {
mktplcRef = builtins.intersectAttrs (lib.genAttrs mktplcRefAttrList (_: null)) ext;
});
extensionFromVscodeMarketplace = mktplcExtRefToExtDrv;