commit ab3de8ed6c976caecf4fda637aa25d5c64ffa5b2 · pyrox.dev/nixpkgs

+4 -4

pkgs/applications/editors/vscode-with-extensions/default.nix

···

       2
       2
        
       , vscodeExtensions ? [] }:

     

       3
       3
        
       

     

       4
       4
        
       /*

     

       5
       5
       -
         `vsixExtensions`

     

       5
       5
       +
         `vscodeExtensions`

     

       6
       6
        
          :  A set of vscode extensions to be installed alongside the editor. Here's a an

     

       7
       7
        
             example:

     

       8
       8
        
       

     
···

       10
       10
        
             vscode-with-extensions.override {

     

       11
       11
        
       

     

       12
       12
        
               # When the extension is already available in the default extensions set.

     

       13
       13
       -
               vscodeExtensions = with vscodeExtensions; [

     

       14
       14
       -
                 nix

     

       13
       13
       +
               vscodeExtensions = with vscode-extensions; [

     

       14
       14
       +
                 bbenoist.Nix

     

       15
       15
        
               ]   

     

       16
       16
        
       

     

       17
       17
        
               # Concise version from the vscode market place when not available in the default set.

     

       18
       18
       -
               ++ vscodeUtils.extensionsFromVscodeMarketplace [

     

       18
       18
       +
               ++ vscode-utils.extensionsFromVscodeMarketplace [

     

       19
       19
        
                 {

     

       20
       20
        
                   name = "code-runner";

     

       21
       21
        
                   publisher = "formulahendry";

+12 -5

pkgs/misc/vscode-extensions/default.nix

···

       3
       3
        
       let

     

       4
       4
        
         inherit (vscode-utils) buildVscodeExtension buildVscodeMarketplaceExtension;

     

       5
       5
        
       in

     

       6
       6
       -
       

     

       6
       6
       +
       #

     

       7
       7
       +
       # Unless there is a good reason not to, we attemp to use the same name as the 

     

       8
       8
       +
       # extension's unique identifier (the name the extension gets when installed

     

       9
       9
       +
       # from vscode under `~/.vscode`) and found on the marketplace extension page.

     

       10
       10
       +
       # So an extension's attribute name should be of the form: 

     

       11
       11
       +
       # "${mktplcRef.publisher}.${mktplcRef.name}".

     

       12
       12
       +
       #

     

       7
       13
        
       rec {

     

       8
       8
       -
         nix = buildVscodeMarketplaceExtension {

     

       14
       14
       +
         bbenoist.Nix = buildVscodeMarketplaceExtension {

     

       9
       15
        
           mktplcRef = {

     

       10
       10
       -
               name = "nix";

     

       16
       16
       +
               name = "Nix";

     

       11
       17
        
               publisher = "bbenoist";

     

       12
       18
        
               version = "1.0.1";

     

       13
       19
        
               sha256 = "0zd0n9f5z1f0ckzfjr38xw2zzmcxg1gjrava7yahg5cvdcw6l35b";

     

       14
       20
        
           };

     

       15
       15
       -
       

     

       16
       16
       -
           # TODO: Fill meta with appropriate information.

     

       21
       21
       +
           meta = with stdenv.lib; {

     

       22
       22
       +
             license = licenses.mit;

     

       23
       23
       +
           };

     

       17
       24
        
         };

     

       18
       25
        
       }

+14 -25

pkgs/misc/vscode-extensions/vscode-utils.nix

···

       1
       1
       -
       { stdenv, lib, fetchurl, runCommand, vscode, which }:

     

       1
       1
       +
       { stdenv, lib, fetchurl, runCommand, vscode, unzip }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         extendedPkgVersion = lib.getVersion vscode;

     
···

       7
       7
        
         mktplcExtRefToFetchArgs = ext: {

     

       8
       8
        
           url = "https://${ext.publisher}.gallery.vsassets.io/_apis/public/gallery/publisher/${ext.publisher}/extension/${ext.name}/${ext.version}/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage";

     

       9
       9
        
           sha256 = ext.sha256;

     

       10
       10
       -
           name = "${ext.name}.vsix";

     

       10
       10
       +
           # The `*.vsix` file is in the end a simple zip file. Change the extension

     

       11
       11
       +
           # so that existing `unzip` hooks takes care of the unpacking.

     

       12
       12
       +
           name = "${ext.publisher}-${ext.name}.zip";

     

       11
       13
        
         };

     

       12
       14
        
       

     

       13
       15
        
         buildVscodeExtension = a@{

     

       14
       16
        
           name,

     

       15
       17
        
           namePrefix ? "${extendedPkgName}-extension-",

     

       16
       18
        
           src,

     

       19
       19
       +
           # Same as "Unique Identifier" on the extension's web page.

     

       20
       20
       +
           # For the moment, only serve as unique extension dir.

     

       21
       21
       +
           vscodeExtUniqueId,

     

       17
       22
        
           configurePhase ? ":",

     

       18
       23
        
           buildPhase ? ":",

     

       19
       24
        
           dontPatchELF ? true,

     
···

       21
       26
        
           buildInputs ? [],

     

       22
       27
        
           ...

     

       23
       28
        
         }:

     

       24
       24
       -
         stdenv.mkDerivation (a // {

     

       29
       29
       +
         stdenv.mkDerivation ((removeAttrs a [ "vscodeExtUniqueId" ]) //  {

     

       25
       30
        
       

     

       26
       31
        
           name = namePrefix + name;

     

       27
       32
        
       

     

       33
       33
       +
           inherit vscodeExtUniqueId;

     

       28
       34
        
           inherit configurePhase buildPhase dontPatchELF dontStrip;

     

       29
       35
        
       

     

       30
       30
       -
           # TODO: `which` is an encapsulation leak. It should have been hardwired

     

       31
       31
       -
           #       as part of the `code` wrapper. 

     

       32
       32
       -
           buildInputs = [ vscode which ] ++ buildInputs;

     

       33
       33
       -
       

     

       34
       34
       -
           unpackPhase = ''

     

       35
       35
       -
             # TODO: Unfortunately, 'code' systematically creates its '.vscode' directory

     

       36
       36
       -
             # even tough it has nothing to write in it. We need to redirect this

     

       37
       37
       -
             # to a writeable location as the nix environment already has (but

     

       38
       38
       -
             # to a non writeable one) otherwise the write will fail.

     

       39
       39
       -
             # It would be preferrable if we could intercept / fix this at the source.

     

       40
       40
       -
             HOME="$PWD/code_null_home" code \

     

       41
       41
       -
               --extensions-dir "$PWD" \

     

       42
       42
       -
               --install-extension "${toString src}"

     

       43
       43
       -
       

     

       44
       44
       -
             rm -Rf "$PWD/code_null_home"

     

       45
       45
       -
             cd "$(find . -mindepth 1 -type d -print -quit)"

     

       46
       46
       -
             ls -la

     

       47
       47
       -
           '';

     

       48
       48
       -
       

     

       36
       36
       +
           buildInputs = [ unzip ] ++ buildInputs;

     

       49
       37
        
       

     

       50
       38
        
           installPhase = ''

     

       51
       51
       -
             mkdir -p "$out/share/${extendedPkgName}/extensions/${name}"

     

       52
       52
       -
             find . -mindepth 1 -maxdepth 1 | xargs mv -t "$out/share/${extendedPkgName}/extensions/${name}/"

     

       39
       39
       +
             mkdir -p "$out/share/${extendedPkgName}/extensions/${vscodeExtUniqueId}"

     

       40
       40
       +
             find . -mindepth 1 -maxdepth 1 | xargs mv -t "$out/share/${extendedPkgName}/extensions/${vscodeExtUniqueId}/"

     

       53
       41
        
           '';

     

       54
       42
        
       

     

       55
       43
        
         });

     
···

       65
       53
        
           ...

     

       66
       54
        
         }: assert "" == name; assert null == src;

     

       67
       55
        
         buildVscodeExtension ((removeAttrs a [ "mktplcRef" ]) // {

     

       68
       68
       -
           name = "${mktplcRef.name}-${mktplcRef.version}";

     

       56
       56
       +
           name = "${mktplcRef.publisher}-${mktplcRef.name}-${mktplcRef.version}";

     

       69
       57
        
           src = fetchVsixFromVscodeMarketplace mktplcRef;

     

       58
       58
       +
           vscodeExtUniqueId = "${mktplcRef.publisher}.${mktplcRef.name}";

     

       70
       59
        
         });

     

       71
       60
        
       

     

       72
       61
        
         mktplcRefAttrList = [