From 3ea329c6aa7ef6ba34b5bd7114b3c8128ff6e487 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Sep 2015 10:45:18 +0200
Subject: [PATCH] Revert "all-packages: warn when using deprecated attributes"

This reverts commit c53018c9a17f878f37b390c0bb21845df81be868. This
causes problems for "nix-env -qa", so we'll have to come up with a
clean solution first.

Issue #9456.
---
 pkgs/top-level/all-packages.nix | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 62653937ef87..57621552a8a9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15282,13 +15282,8 @@ let
 
   mg = callPackage ../applications/editors/mg { };
 
-}
-  ### Aliases to attributes converted to the dashed-style.
-  // lib.mapAttrs (name: builtins.trace
-    ( "Warning: using a deprecated attribute '${name}'."
-    + " CamelCase and under_scores are replaced by dashed-names"
-    + " to match the nix-env names better."))
-{ # warnings since 2015-09
+
+  # Attributes for backward compatibility.
   adobeReader = adobe-reader;
   arduino_core = arduino-core;  # added 2015-02-04
   asciidocFull = asciidoc-full;  # added 2014-06-22
@@ -15297,6 +15292,8 @@ let
   lttngTools = lttng-tools;  # added 2014-07-31
   lttngUst = lttng-ust;  # added 2014-07-31
   jquery_ui = jquery-ui;  # added 2014-09-07
+  youtubeDL = youtube-dl;  # added 2014-10-26
+  youtube-dl = pythonPackages.youtube-dl; # added 2015-06-07
   rdiff_backup = rdiff-backup;  # added 2014-11-23
   htmlTidy = html-tidy;  # added 2014-12-06
   libtidy = html-tidy;  # added 2014-12-21
@@ -15304,17 +15301,8 @@ let
   sqliteInteractive = sqlite-interactive;  # added 2014-12-06
   nfsUtils = nfs-utils;  # added 2014-12-06
   buildbotSlave = buildbot-slave;  # added 2014-12-09
-  rssglx = rss-glx; #added 2015-03-25
-
-}
-  ### Other attribute aliases for backward compatibility.
-  // lib.mapAttrs
-      (name: builtins.trace "Warning: using a deprecated attribute '${name}'.")
-{ # warnings since 2015-09
-  youtubeDL = youtube-dl;  # added 2014-10-26
-  youtube-dl = pythonPackages.youtube-dl; # added 2015-06-07
   cool-old-term = cool-retro-term; # added 2015-01-31
-
+  rssglx = rss-glx; #added 2015-03-25
   haskell-ng = haskell;                 # 2015-04-19
   haskellngPackages = haskellPackages;  # 2015-04-19
   inherit (haskell.compiler) jhc uhc;   # 2015-05-15