From 0b67f7cb5dfc2b5080b8e3046917a0a15bb5140d Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@gmail.com>
Date: Sun, 20 Mar 2016 14:50:27 +0000
Subject: [PATCH] Move tweakAlias function into the aliases.nix file, and
 rename it.

---
 pkgs/top-level/aliases.nix      | 14 +++++++++++++-
 pkgs/top-level/all-packages.nix |  7 +------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f2e1bbc5102..944de791929 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2,9 +2,21 @@ self:
 
 with self;
 
+let
+  # Removind recurseForDerivation prevents derivations of aliased attribute
+  # set to appear while listing all the packages available.
+  removeRecurseForDerivations = _n: alias: with lib;
+    if alias.recurseForDerivations or false then
+      removeAttrs alias ["recurseForDerivations"]
+    else alias;
+
+  doNotDisplayTwice = aliases:
+    lib.mapAttrs removeRecurseForDerivations aliases;
+in
+
   ### Deprecated aliases - for backward compatibility
 
-rec {
+doNotDisplayTwice rec {
   accounts-qt = qt5.accounts-qt;  # added 2015-12-19
   adobeReader = adobe-reader;
   aircrackng = aircrack-ng; # added 2016-01-14
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1d120339110..188c548050c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16474,13 +16474,8 @@ let
 
 aliases = import ./aliases.nix self;
 
-tweakAlias = _n: alias: with lib;
-  if alias.recurseForDerivations or false then
-    removeAttrs alias ["recurseForDerivations"]
-  else alias;
-
 in
-  lib.mapAttrs tweakAlias aliases // helperFunctions // stdenvDefault // self // overrides;
+  aliases // helperFunctions // stdenvDefault // self // overrides;
 
 in
   pkgs