Browse Source

config.skipAliases -> config.allowAliases

nixos-19.03
volth 4 years ago
parent
commit
101df126bb
  1. 2
      pkgs/applications/version-management/git-and-tools/default.nix
  2. 2
      pkgs/desktops/gnome-3/default.nix
  3. 2
      pkgs/desktops/xfce/default.nix
  4. 2
      pkgs/misc/vim-plugins/default.nix
  5. 3
      pkgs/top-level/stage.nix

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

@ -130,7 +130,7 @@ let
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;

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

@ -391,7 +391,7 @@ lib.makeScope pkgs.newScope (self: with self; {
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

2
pkgs/desktops/xfce/default.nix

@ -159,7 +159,7 @@ lib.makeScope pkgs.newScope (self: with self; {
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;

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

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

3
pkgs/top-level/stage.nix

@ -97,8 +97,7 @@ let
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

Loading…
Cancel
Save