Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: cda41cf743f0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: dd8f077ff90e
Choose a head ref
  • 4 commits
  • 2 files changed
  • 2 contributors

Commits on May 30, 2020

  1. vscode-utils: remove extra whitespace

    @eadwu
    eadwu committed May 30, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    picnoir Félix
    GPG key ID: EFD315F31848DBA4
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3704ed1 View commit details

  2. vscode-with-extensions: fix extension directory

    @eadwu
    eadwu committed May 30, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    picnoir Félix
    GPG key ID: EFD315F31848DBA4
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0717848 View commit details

  3. vscode-extensions.vscode-utils: reapply some changes from bb24faf 

    bb24faf
    @eadwu
    eadwu committed May 30, 2020
    Copy the full SHA
    4f99c57 View commit details

Commits on Jun 4, 2020

  1. Merge pull request #89196 from eadwu/vscode/76427-fallout 

    vscode: fix #76427 fallout
    @veprbl
    veprbl authored Jun 4, 2020
    Copy the full SHA
    dd8f077 View commit details
Showing with 6 additions and 11 deletions.
  1. +1 −1 pkgs/applications/editors/vscode/with-extensions.nix
  2. +5 −10 pkgs/misc/vscode-extensions/vscode-utils.nix
2 changes: 1 addition & 1 deletion pkgs/applications/editors/vscode/with-extensions.nix
View file
Original file line number Diff line number Diff line change
@@ -70,6 +70,6 @@ runCommand "${wrappedPkgName}-with-extensions-${wrappedPkgVersion}" {
ln -sT "${vscode}/share/applications/${executableName}.desktop" "$out/share/applications/${executableName}.desktop"
ln -sT "${vscode}/share/applications/${executableName}-url-handler.desktop" "$out/share/applications/${executableName}-url-handler.desktop"
makeWrapper "${vscode}/bin/${executableName}" "$out/bin/${executableName}" ${lib.optionalString (vscodeExtensions != []) ''
--add-flags "--extensions-dir ${combinedExtensionsDrv}"
--add-flags "--extensions-dir ${combinedExtensionsDrv}/share/vscode/extensions"
''}
''
15 changes: 5 additions & 10 deletions pkgs/misc/vscode-extensions/vscode-utils.nix
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
{ stdenv, lib, buildEnv, writeShellScriptBin, fetchurl, vscode, unzip, jq }:
let
extendedPkgVersion = lib.getVersion vscode;
extendedPkgName = lib.removeSuffix "-${extendedPkgVersion}" vscode.name;


buildVscodeExtension = a@{
name,
namePrefix ? "${extendedPkgName}-extension-",
src,
# Same as "Unique Identifier" on the extension's web page.
# For the moment, only serve as unique extension dir.
@@ -18,14 +13,14 @@ let
buildInputs ? [],
...
}:
stdenv.mkDerivation ((removeAttrs a [ "vscodeExtUniqueId" ]) // {
stdenv.mkDerivation ((removeAttrs a [ "vscodeExtUniqueId" ]) // {

name = namePrefix + name;
name = "vscode-extension-${name}";

inherit vscodeExtUniqueId;
inherit configurePhase buildPhase dontPatchELF dontStrip;

installPrefix = "share/${extendedPkgName}/extensions/${vscodeExtUniqueId}";
installPrefix = "share/vscode/extensions/${vscodeExtUniqueId}";

buildInputs = [ unzip ] ++ buildInputs;

@@ -80,7 +75,7 @@ let
vscodeDefault = vscode;
};


vscodeExts2nix = import ./vscodeExts2nix.nix {
inherit lib writeShellScriptBin;
vscodeDefault = vscode;
@@ -90,7 +85,7 @@ let
inherit lib buildEnv writeShellScriptBin extensionsFromVscodeMarketplace jq;
vscodeDefault = vscode;
};
in
in
{
inherit fetchVsixFromVscodeMarketplace buildVscodeExtension
buildVscodeMarketplaceExtension extensionFromVscodeMarketplace