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

config.skipAliases -> config.allowAliases

This commit is contained in:
volth 2018-07-12 00:51:54 +00:00
parent 4bafaaff8a
commit 101df126bb
5 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/version-management/git-and-tools/default.nix
View File

@ -130,7 +130,7 @@ let
transcrypt = callPackage ./transcrypt { }; transcrypt = callPackage ./transcrypt { };
} // lib.optionalAttrs (config.skipAliases or false == false) (with self; { } // lib.optionalAttrs (config.allowAliases or true) (with self; {
# aliases # aliases
gitAnnex = git-annex; gitAnnex = git-annex;
svn_all_fast_export = svn-all-fast-export; svn_all_fast_export = svn-all-fast-export;

2
pkgs/desktops/gnome-3/default.nix
View File

@ -391,7 +391,7 @@ lib.makeScope pkgs.newScope (self: with self; {
gnome-packagekit = callPackage ./misc/gnome-packagekit { }; gnome-packagekit = callPackage ./misc/gnome-packagekit { };
} // lib.optionalAttrs (config.skipAliases or false == false) { } // lib.optionalAttrs (config.allowAliases or true) {
#### Legacy aliases #### Legacy aliases
evolution_data_server = evolution-data-server; # added 2018-02-25 evolution_data_server = evolution-data-server; # added 2018-02-25

2
pkgs/desktops/xfce/default.nix
View File

@ -159,7 +159,7 @@ lib.makeScope pkgs.newScope (self: with self; {
xfce4_power_manager_gtk3 = xfce4-power-manager.override { withGtk3 = true; }; xfce4_power_manager_gtk3 = xfce4-power-manager.override { withGtk3 = true; };
} // lib.optionalAttrs (config.skipAliases or false == false) { } // lib.optionalAttrs (config.allowAliases or true) {
#### ALIASES - added 2018-01 #### ALIASES - added 2018-01
terminal = xfce4-terminal; terminal = xfce4-terminal;

2
pkgs/misc/vim-plugins/default.nix
View File

@ -3213,7 +3213,7 @@ let
}; };
} // lib.optionalAttrs (config.skipAliases or false == false) (with self; { } // lib.optionalAttrs (config.allowAliases or true) (with self; {
# aliasess # aliasess
airline = vim-airline; airline = vim-airline;

3
pkgs/top-level/stage.nix
View File

@ -97,8 +97,7 @@ let
res self; res self;
in res; in res;
aliases = self: super: if config.skipAliases or false then {} aliases = self: super: lib.optionalAttrs (config.allowAliases or true) (import ./aliases.nix lib self super);
else import ./aliases.nix lib self super;
# stdenvOverrides is used to avoid having multiple of versions # stdenvOverrides is used to avoid having multiple of versions
# of certain dependencies that were used in bootstrapping the # of certain dependencies that were used in bootstrapping the