nixStable: make an alias of nix

pkgs/development/tools/misc/hydra/default.nix

@@ -1,4 +1,4 @@
-{ fetchFromGitHub, nixStable, callPackage, nixUnstable, nixosTests }:
+{ fetchFromGitHub, nix, callPackage, nixUnstable, nixosTests }:
 
 {
   hydra-unstable = callPackage ./common.nix {

pkgs/tools/package-management/nix/default.nix

@@ -44,9 +44,7 @@ let
       inherit storeDir stateDir confDir;
     };
 in rec {
-  nix = nixStable;
-
-  nixStable = nix_2_5;
+  nix = nix_2_5;
 
   nix_2_3 = buildNix rec {
     version = "2.3.16";

pkgs/top-level/aliases.nix

@@ -663,7 +663,8 @@ mapAliases ({
   nilfs_utils = nilfs-utils; # added 2018-04-25
   nix-direnv-flakes = nix-direnv;
   nix-review = nixpkgs-review; # added 2019-12-22
-  nixFlakes = nixStable; # added 2021-05-21
+  nixFlakes = nix; # added 2021-05-21
+  nixStable = nix; # added-2022-01-24
   nmap_graphical = nmap-graphical;  # added 2017-01-19
   nmap-unfree = nmap; # added 2021-04-06
   nologin = shadow; # added 2018-04-25

pkgs/top-level/all-packages.nix

@@ -33134,7 +33134,6 @@ with pkgs;
       inherit (darwin.apple_sdk.frameworks) Security;
       })
     nix
-    nixStable
     nix_2_3
     nix_2_4
     nix_2_5