JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use new primops

Browse Source
This commit is contained in:
Eelco Dolstra 2014-10-04 18:30:35 +02:00
parent eeac1e70aa
commit 0e120dc68f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/attrsets.nix
View File

@ -55,7 +55,7 @@ rec {
attrValues {c = 3; a = 1; b = 2;} attrValues {c = 3; a = 1; b = 2;}
=> [1 2 3] => [1 2 3]
*/ */
attrValues = attrs: attrVals (attrNames attrs) attrs; attrValues = builtins.attrValues or (attrs: attrVals (attrNames attrs) attrs);
/* Collect each attribute named `attr' from a list of attribute /* Collect each attribute named `attr' from a list of attribute
@ -65,7 +65,8 @@ rec {
catAttrs "a" [{a = 1;} {b = 0;} {a = 2;}] catAttrs "a" [{a = 1;} {b = 0;} {a = 2;}]
=> [1 2] => [1 2]
*/ */
catAttrs = attr: l: concatLists (map (s: if hasAttr attr s then [(getAttr attr s)] else []) l); catAttrs = builtins.catAttrs or
(attr: l: concatLists (map (s: if hasAttr attr s then [(getAttr attr s)] else []) l));
/* Filter an attribute set by removing all attributes for which the /* Filter an attribute set by removing all attributes for which the