commit a7eef26e86ee7c825ea3fd6e48cb8fde1d40e08d · pyrox.dev/nixpkgs

+3 -4

ci/eval/compare/maintainers.nix

···

       53
       53
        
           // {

     

       54
       54
        
             # TODO: Refactor this so we can ping entire teams instead of the individual members.

     

       55
       55
        
             # Note that this will require keeping track of GH team IDs in "maintainers/teams.nix".

     

       56
       56
       -
             maintainers =

     

       57
       57
       -
               meta.maintainers or [ ]

     

       58
       58
       -
               ++ lib.flatten (map (team: team.members or [ ]) (meta.teams or [ ]));

     

       56
       56
       +
             maintainers = meta.maintainers or [ ];

     

       59
       57
        
           }

     

       60
       58
        
         ) attrsWithPackages;

     

       61
       59
        
       

     
···

       64
       62
        
           (lib.lists.unique (

     

       65
       63
        
             builtins.map (pos: lib.strings.removePrefix (toString ../..) pos.file) (

     

       66
       64
        
               builtins.filter (x: x != null) [

     

       67
       67
       -
                 (builtins.unsafeGetAttrPos "maintainers" (drv.meta or { }))

     

       65
       65
       +
                 ((drv.meta or { }).maintainersPosition or null)

     

       66
       66
       +
                 ((drv.meta or { }).teamsPosition or null)

     

       68
       67
        
                 (builtins.unsafeGetAttrPos "src" drv)

     

       69
       68
        
                 # broken because name is always set by stdenv:

     

       70
       69
        
                 #    # A hack to make `nix-env -qa` and `nix search` ignore broken packages.

+17

pkgs/stdenv/generic/check-meta.nix

···

       411
       411
        
             isFcitxEngine = bool;

     

       412
       412
        
             isIbusEngine = bool;

     

       413
       413
        
             isGutenprint = bool;

     

       414
       414
       +
       

     

       415
       415
       +
             # Used for the original location of the maintainer and team attributes to assist with pings.

     

       416
       416
       +
             maintainersPosition = any;

     

       417
       417
       +
             teamsPosition = any;

     

       414
       418
        
           };

     

       415
       419
        
       

     

       416
       420
        
         checkMetaAttr =

     
···

       589
       593
        
               )

     

       590
       594
        
             ] ++ optional (hasOutput "man") "man";

     

       591
       595
        
           }

     

       596
       596
       +
           // {

     

       597
       597
       +
             # CI scripts look at these to determine pings.

     

       598
       598
       +
             maintainersPosition = builtins.unsafeGetAttrPos "maintainers" (attrs.meta or { });

     

       599
       599
       +
             teamsPosition = builtins.unsafeGetAttrPos "teams" (attrs.meta or { });

     

       600
       600
       +
           }

     

       592
       601
        
           // attrs.meta or { }

     

       593
       602
        
           # Fill `meta.position` to identify the source location of the package.

     

       594
       603
        
           // optionalAttrs (pos != null) {

     

       595
       604
        
             position = pos.file + ":" + toString pos.line;

     

       605
       605
       +
           }

     

       606
       606
       +
           // {

     

       607
       607
       +
             # Maintainers should be inclusive of teams.

     

       608
       608
       +
             # Note that there may be external consumers of this API (repology, for instance) -

     

       609
       609
       +
             # if you add a new maintainer or team attribute please ensure that this expectation is still met.

     

       610
       610
       +
             maintainers =

     

       611
       611
       +
               attrs.meta.maintainers or [ ]

     

       612
       612
       +
               ++ concatMap (team: team.members or [ ]) attrs.meta.teams or [ ];

     

       596
       613
        
           }

     

       597
       614
        
           // {

     

       598
       615
        
             # Expose the result of the checks for everyone to see.