Revert "Reverts a bunch of commits as a try to fix GC errors."

This reverts commit 1e4ba025c260fa6852765e9f5c59e985f10c6a43.

Conflicts:
	pkgs/development/web/nodejs/build-node-package.nix

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/lists.nix b/lib/lists.nix
index 2dda700bef3..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);
 
-  # Substracts list 'e' from another list
-  substract = e: filter (x: !(elem x e));
+  # Subtracts list 'e' from another list
+  subtractLists = e: filter (x: !(elem x e));
 }