From 694f01db2d2e1cde06ee243a5909d196e84f0a18 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 4 Mar 2015 22:11:47 +0100 Subject: [PATCH] intersect -> intersectLists, subtract -> subtractLists --- lib/lists.nix | 4 ++-- pkgs/development/web/nodejs/build-node-package.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/lists.nix b/lib/lists.nix index 540f8c40760..fa8cbddfd94 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -234,8 +234,8 @@ rec { in [x] ++ remove x xs; # Intersects list 'e' and another list - intersect = e: filter (x: elem x e); + intersectLists = e: filter (x: elem x e); # Subtracts list 'e' from another list - subtract = e: filter (x: !(elem x e)); + subtractLists = e: filter (x: !(elem x e)); } diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix index 36f80c635b7..042e29f2970 100644 --- a/pkgs/development/web/nodejs/build-node-package.nix +++ b/pkgs/development/web/nodejs/build-node-package.nix @@ -67,9 +67,9 @@ let if filterPlatforms == [] then platforms else if hasPrefix "!" entry then - subtract (intersect filterPlatforms nodejs.meta.platforms) platforms + subtractLists (intersectLists filterPlatforms nodejs.meta.platforms) platforms else - platforms ++ (intersect filterPlatforms nodejs.meta.platforms) + platforms ++ (intersectLists filterPlatforms nodejs.meta.platforms) ) [] os; mapDependencies = deps: f: rec {