From 1c38ce51ef3407362872a21c1b8731a19be89824 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Wed, 8 Jan 2020 23:44:37 +0100
Subject: [PATCH] rxvt-unicode: add aliases for name change

---
 pkgs/applications/misc/rxvt-unicode/wrapper.nix |  5 +++--
 pkgs/top-level/aliases.nix                      | 11 ++++++++++-
 pkgs/top-level/all-packages.nix                 |  2 ++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/rxvt-unicode/wrapper.nix b/pkgs/applications/misc/rxvt-unicode/wrapper.nix
index b791e8aae2ee..38978799b5a8 100644
--- a/pkgs/applications/misc/rxvt-unicode/wrapper.nix
+++ b/pkgs/applications/misc/rxvt-unicode/wrapper.nix
@@ -3,6 +3,7 @@
 , makeWrapper
 , lib
 , rxvt-unicode-unwrapped
+, rxvt-unicode-plugins
 , perlPackages
 , configure ? { availablePlugins, ... }:
   { plugins = builtins.attrValues availablePlugins;
@@ -12,11 +13,11 @@
 }:
 
 let
-  availablePlugins = import ../rxvt-unicode-plugins { inherit callPackage; };
+  availablePlugins = rxvt-unicode-plugins;
 
   # Transform the string "self" to the plugin itself.
   # It's needed for plugins like bidi who depends on the perl
-  # package the provide themself.
+  # package they provide themself.
   mkPerlDeps = p:
     let deps = p.perlPackages or [ ];
     in map (x: if x == "self" then p else x) deps;
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index c543af2405c3..40468139db70 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -365,7 +365,16 @@ mapAliases ({
   ruby_2_4_3 = throw "deprecated 2018-0213: use ruby_2_4 instead";
   ruby_2_5_0 = throw "deprecated 2018-0213: use ruby_2_5 instead";
   rubygems = throw "deprecated 2016-03-02: rubygems is now bundled with ruby";
-  rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; # added 2015-04-02
+  rxvt_unicode_with-plugins = rxvt-unicode; # added 2020-02-02
+  rxvt_unicode = rxvt-unicode-unwrapped; # added 2020-02-02
+  urxvt_autocomplete_all_the_things = rxvt-unicode-plugins.autocomplete-all-the-things; # added 2020-02-02
+  urxvt_perl = rxvt-unicode-plugins.perl; # added 2020-02-02
+  urxvt_perls = rxvt-unicode-plugins.perls; # added 2020-02-02
+  urxvt_tabbedex = rxvt-unicode-plugins.tabbedex; # added 2020-02-02
+  urxvt_font_size = rxvt-unicode-plugins.font-size; # added 2020-02-02
+  urxvt_theme_switch = rxvt-unicode-plugins.theme-switch; # added 2020-02-02
+  urxvt_vtwheel = rxvt-unicode-plugins.vtwheel; # added 2020-02-02
+  urxvt_bidi = rxvt-unicode-plugins.bidi; # added 2020-02-02
   s6Dns = s6-dns; # added 2018-07-23
   s6Networking = s6-networking; # added 2018-07-23
   s6LinuxUtils = s6-linux-utils; # added 2018-07-23
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 62e3eb8d4bcb..3c0aea47342f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21233,6 +21233,8 @@ in
 
   rxvt-unicode-unwrapped = callPackage ../applications/misc/rxvt-unicode { };
 
+  rxvt-unicode-plugins = import ../applications/misc/rxvt-unicode-plugins { inherit callPackage; };
+
   uade123 = callPackage ../applications/audio/uade123 {};
 
   udevil = callPackage ../applications/misc/udevil {};