config.skipAliases -> config.allowAliases

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

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

pkgs/desktops/gnome-3/default.nix

···
 
   gnome-packagekit = callPackage ./misc/gnome-packagekit { };
 
-} // lib.optionalAttrs (config.skipAliases or false == false) {
+} // lib.optionalAttrs (config.allowAliases or true) {
 #### Legacy aliases
 
   evolution_data_server = evolution-data-server; # added 2018-02-25

pkgs/desktops/xfce/default.nix

···
 
   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
 
   terminal = xfce4-terminal;

pkgs/misc/vim-plugins/default.nix

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

pkgs/top-level/stage.nix

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