···23292329 # then apply extension specific modifcations to packages.
2330233023312331 # overlays will be applied left to right, overrides should come after aliases.
23322332- overlays = lib.optionals (config.allowAliases or true) [ aliases ];
23322332+ overlays = lib.optionals config.allowAliases [ aliases ];
2333233323342334 toFix = lib.foldl' (lib.flip lib.extends) baseExtensions overlays;
23352335in
+2-2
pkgs/applications/misc/bottles/default.nix
···2020in
2121python3Packages.buildPythonApplication rec {
2222 pname = "bottles";
2323- version = "2022.3.14-trento-3";
2424- sha256 = "0wdqj9l69a9pnray2zcfgl2yw0hmrh23njbgwgqccimch014ckdq";
2323+ version = "2022.3.28-trento-1";
2424+ sha256 = "1mpvym7b88pb0xxij32arj31q5m6b3z47p8zv9njvkfs0151b2v4";
2525 # Note: Update via pkgs/applications/misc/bottles/update.py
2626 # mostly copypasted from pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py
2727
···278278 gnome-autoar = callPackage ./misc/gnome-autoar { };
279279280280 gnome-packagekit = callPackage ./misc/gnome-packagekit { };
281281-}) // lib.optionalAttrs (config.allowAliases or true) {
281281+}) // lib.optionalAttrs config.allowAliases {
282282#### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope.
283283284284 gnome-desktop = pkgs.gnome-desktop; # added 2022-03-16
···3232 feature = "run <literal>checkPhase</literal> by default";
3333 };
34343535+ allowAliases = mkOption {
3636+ type = types.bool;
3737+ default = true;
3838+ description = ''
3939+ Whether to expose old attribute names for compatibility.
4040+4141+ The recommended setting is to enable this, as it
4242+ improves backward compatibity, easing updates.
4343+4444+ The only reason to disable aliases is for continuous
4545+ integration purposes. For instance, Nixpkgs should
4646+ not depend on aliases in its internal code. Projects
4747+ that aren't Nixpkgs should be cautious of instantly
4848+ removing all usages of aliases, as migrating too soon
4949+ can break compatibility with the stable Nixpkgs releases.
5050+ '';
5151+ };
5252+3553 };
36543755in {
+1-1
pkgs/top-level/kodi-packages.nix
···153153 trakt-module = callPackage ../applications/video/kodi/addons/trakt-module { };
154154155155 trakt = callPackage ../applications/video/kodi/addons/trakt { };
156156-}; in self // lib.optionalAttrs (config.allowAliases or true) {
156156+}; in self // lib.optionalAttrs config.allowAliases {
157157 # deprecated or renamed packages
158158159159 controllers = throw "kodi.packages.controllers has been replaced with kodi.packages.controller-topology-project - a package which contains a large number of controller profiles." { };
+1-1
pkgs/top-level/linux-kernels.nix
···476476477477 can-isotp = callPackage ../os-specific/linux/can-isotp { };
478478479479- } // lib.optionalAttrs (config.allowAliases or false) {
479479+ } // lib.optionalAttrs config.allowAliases {
480480 ati_drivers_x11 = throw "ati drivers are no longer supported by any kernel >=4.1"; # added 2021-05-18;
481481 });
482482
+1-1
pkgs/top-level/perl-packages.nix
···2540625406 };
2540725407 };
25408254082540925409-} // lib.optionalAttrs (config.allowAliases or true) {
2540925409+} // lib.optionalAttrs config.allowAliases {
2541025410 autodie = null; # part of Perl
2541125411 AutoLoader = null; # part of Perl 5.22
2541225412 constant = null; # part of Perl 5.22
+1-1
pkgs/top-level/stage.nix
···152152 res self super;
153153 in res;
154154155155- aliases = self: super: lib.optionalAttrs (config.allowAliases or true) (import ./aliases.nix lib self super);
155155+ aliases = self: super: lib.optionalAttrs config.allowAliases (import ./aliases.nix lib self super);
156156157157 # stdenvOverrides is used to avoid having multiple of versions
158158 # of certain dependencies that were used in bootstrapping the