commit 228621e42dc43f936b66e0ed042c90c511aa0535 · pyrox.dev/nixpkgs

+9 -5

lib/attrsets.nix

···

       5
       5
        
       

     

       6
       6
        
       let

     

       7
       7
        
         inherit (builtins) head length;

     

       8
       8
       -
         inherit (lib.trivial) mergeAttrs warn;

     

       8
       8
       +
         inherit (lib.trivial) isInOldestRelease mergeAttrs warn warnIf;

     

       9
       9
        
         inherit (lib.strings) concatStringsSep concatMapStringsSep escapeNixIdentifier sanitizeDerivationName;

     

       10
       10
        
         inherit (lib.lists) foldr foldl' concatMap elemAt all partition groupBy take foldl;

     

       11
       11
        
       in

     
···

       885
       885
        
           # Type

     

       886
       886
        
       

     

       887
       887
        
           ```

     

       888
       888
       -
           cartesianProductOfSets :: AttrSet -> [AttrSet]

     

       888
       888
       +
           cartesianProduct :: AttrSet -> [AttrSet]

     

       889
       889
        
           ```

     

       890
       890
        
       

     

       891
       891
        
           # Examples

     

       892
       892
        
           :::{.example}

     

       893
       893
       -
           ## `lib.attrsets.cartesianProductOfSets` usage example

     

       893
       893
       +
           ## `lib.attrsets.cartesianProduct` usage example

     

       894
       894
        
       

     

       895
       895
        
           ```nix

     

       896
       896
       -
           cartesianProductOfSets { a = [ 1 2 ]; b = [ 10 20 ]; }

     

       896
       896
       +
           cartesianProduct { a = [ 1 2 ]; b = [ 10 20 ]; }

     

       897
       897
        
           => [

     

       898
       898
        
                { a = 1; b = 10; }

     

       899
       899
        
                { a = 1; b = 20; }

     
···

       904
       904
        
       

     

       905
       905
        
           :::

     

       906
       906
        
         */

     

       907
       907
       -
         cartesianProductOfSets =

     

       907
       907
       +
         cartesianProduct =

     

       908
       908
        
           attrsOfLists:

     

       909
       909
        
           foldl' (listOfAttrs: attrName:

     

       910
       910
        
             concatMap (attrs:

     
···

       1999
       1999
        
         # DEPRECATED

     

       2000
       2000
        
         zip = warn

     

       2001
       2001
        
           "lib.zip is a deprecated alias of lib.zipAttrsWith." zipAttrsWith;

     

       2002
       2002
       +
       

     

       2003
       2003
       +
         # DEPRECATED

     

       2004
       2004
       +
         cartesianProductOfSets = warnIf (isInOldestRelease 2405)

     

       2005
       2005
       +
           "lib.cartesianProductOfSets is a deprecated alias of lib.cartesianProduct." cartesianProduct;

     

       2002
       2006
        
       }

+1 -1

lib/default.nix

···

       86
       86
        
             zipAttrsWithNames zipAttrsWith zipAttrs recursiveUpdateUntil

     

       87
       87
        
             recursiveUpdate matchAttrs mergeAttrsList overrideExisting showAttrPath getOutput

     

       88
       88
        
             getBin getLib getDev getMan chooseDevOutputs zipWithNames zip

     

       89
       89
       -
             recurseIntoAttrs dontRecurseIntoAttrs cartesianProductOfSets

     

       89
       89
       +
             recurseIntoAttrs dontRecurseIntoAttrs cartesianProduct cartesianProductOfSets

     

       90
       90
        
             updateManyAttrsByPath;

     

       91
       91
        
           inherit (self.lists) singleton forEach foldr fold foldl foldl' imap0 imap1

     

       92
       92
        
             concatMap flatten remove findSingle findFirst any all count