JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #79998 from rnhmjoj/urxvt-fix

Browse Source 
rxvt-unicode: fix typo in aliases.nix
This commit is contained in:
Michele Guerini Rocco 2020-02-13 11:04:56 +01:00 committed by GitHub
commit 21b31c4e51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/programs/sway.nix
View File

@ -88,10 +88,10 @@ in {
default = with pkgs; [
swaylock swayidle
xwayland alacritty dmenu
rxvt_unicode # For backward compatibility (old default terminal)
rxvt-unicode # For backward compatibility (old default terminal)
];
defaultText = literalExample ''
with pkgs; [ swaylock swayidle xwayland rxvt_unicode dmenu ];
with pkgs; [ swaylock swayidle xwayland rxvt-unicode dmenu ];
'';
example = literalExample ''
with pkgs; [

6
nixos/modules/services/x11/urxvtd.nix
View File

@ -18,10 +18,10 @@ in {
};
package = mkOption {
default = pkgs.rxvt_unicode-with-plugins;
defaultText = "pkgs.rxvt_unicode-with-plugins";
default = pkgs.rxvt-unicode;
defaultText = "pkgs.rxvt-unicode";
description = ''
Package to install. Usually pkgs.rxvt_unicode-with-plugins or pkgs.rxvt_unicode
Package to install. Usually pkgs.rxvt-unicode.
'';
type = types.package;
};

4
pkgs/applications/misc/rxvt-unicode-plugins/urxvt-vtwheel/default.nix
View File

@ -2,7 +2,7 @@
stdenv.mkDerivation {
name = "rxvt_unicode-vtwheel-0.3.2";
name = "rxvt-unicode-vtwheel-0.3.2";
src = fetchgit {
url = "https://aur.archlinux.org/urxvt-vtwheel.git";
@ -24,4 +24,4 @@ stdenv.mkDerivation {
platforms = with platforms; unix;
};
}
}

2
pkgs/top-level/aliases.nix
View File

@ -384,7 +384,7 @@ mapAliases ({
ruby_2_5_0 = throw "deprecated 2018-0213: use a newer version of ruby";
rubyPackages_2_4 = throw "deprecated 2019-12: use a newer version of rubyPackages instead";
rubygems = throw "deprecated 2016-03-02: rubygems is now bundled with ruby";
rxvt_unicode_with-plugins = rxvt-unicode; # added 2020-02-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