commit f29292db76356bfbd02dceb2ca795f67b68d2be6 · pyrox.dev/nixpkgs

+30 -1

pkgs/development/tools/parsing/tree-sitter/default.nix

···

       71
       71
        
           in

     

       72
       72
        
           lib.mapAttrs change grammars;

     

       73
       73
        
       

     

       74
       74
       +
         # Usage:

     

       75
       75
       +
         # pkgs.tree-sitter.withPlugins (p: [ p.tree-sitter-c p.tree-sitter-java ... ])

     

       76
       76
       +
         #

     

       77
       77
       +
         # or for all grammars:

     

       78
       78
       +
         # pkgs.tree-sitter.withPlugins (_: allGrammars)

     

       79
       79
       +
         # which is equivalent to

     

       80
       80
       +
         # pkgs.tree-sitter.withPlugins (p: builtins.attrValues p)

     

       81
       81
       +
         withPlugins = grammarFn:

     

       82
       82
       +
           let

     

       83
       83
       +
             grammars = grammarFn builtGrammars;

     

       84
       84
       +
           in

     

       85
       85
       +
           linkFarm "grammars"

     

       86
       86
       +
             (map

     

       87
       87
       +
               (drv:

     

       88
       88
       +
                 let

     

       89
       89
       +
                   name = lib.strings.getName drv;

     

       90
       90
       +
                 in

     

       91
       91
       +
                 {

     

       92
       92
       +
                   name =

     

       93
       93
       +
                     (lib.strings.removePrefix "tree-sitter-"

     

       94
       94
       +
                       (lib.strings.removeSuffix "-grammar" name))

     

       95
       95
       +
                     + stdenv.hostPlatform.extensions.sharedLibrary;

     

       96
       96
       +
                   path = "${drv}/parser";

     

       97
       97
       +
                 }

     

       98
       98
       +
               )

     

       99
       99
       +
               grammars);

     

       100
       100
       +
       

     

       101
       101
       +
         allGrammars = builtins.attrValues builtGrammars;

     

       102
       102
       +
       

     

       74
       103
        
       in

     

       75
       104
        
       rustPlatform.buildRustPackage {

     

       76
       105
        
         pname = "tree-sitter";

     
···

       111
       140
        
           updater = {

     

       112
       141
        
             inherit update-all-grammars;

     

       113
       142
        
           };

     

       114
       114
       -
           inherit grammars builtGrammars;

     

       143
       143
       +
           inherit grammars builtGrammars withPlugins allGrammars;

     

       115
       144
        
       

     

       116
       145
        
           tests = {

     

       117
       146
        
             # make sure all grammars build

+21

pkgs/misc/vim-plugins/overrides.nix

···

       50
       50
        
       , CoreFoundation

     

       51
       51
        
       , CoreServices

     

       52
       52
        
       

     

       53
       53
       +
       # nvim-treesitter dependencies

     

       54
       54
       +
       , tree-sitter

     

       55
       55
       +
       

     

       53
       56
        
         # sved dependencies

     

       54
       57
        
       , glib

     

       55
       58
        
       , gobject-introspection

     
···

       362
       365
        
       

     

       363
       366
        
         nvim-lsputils = super.nvim-lsputils.overrideAttrs (old: {

     

       364
       367
        
           dependencies = with super; [ popfix ];

     

       368
       368
       +
         });

     

       369
       369
       +
       

     

       370
       370
       +
         # Usage:

     

       371
       371
       +
         # pkgs.vimPlugins.nvim-treesitter.withPlugins (p: [ p.tree-sitter-c p.tree-sitter-java ... ])

     

       372
       372
       +
         # or for all grammars:

     

       373
       373
       +
         # pkgs.vimPlugins.nvim-treesitter.withPlugins (_: tree-sitter.allGrammars)

     

       374
       374
       +
         nvim-treesitter = super.nvim-treesitter.overrideAttrs (old: {

     

       375
       375
       +
           passthru.withPlugins =

     

       376
       376
       +
             grammarFn: self.nvim-treesitter.overrideAttrs (_: {

     

       377
       377
       +
               postPatch =

     

       378
       378
       +
                 let

     

       379
       379
       +
                   grammars = tree-sitter.withPlugins grammarFn;

     

       380
       380
       +
                 in

     

       381
       381
       +
                 ''

     

       382
       382
       +
                   rm -r parser

     

       383
       383
       +
                   ln -s ${grammars} parser

     

       384
       384
       +
                 '';

     

       385
       385
       +
             });

     

       365
       386
        
         });

     

       366
       387
        
       

     

       367
       388
        
         onehalf = super.onehalf.overrideAttrs (old: {