From 5210313299beadedb004cfd4dc1758be10d65031 Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <bernardo@meurer.org>
Date: Mon, 24 Jan 2022 23:29:44 -0800
Subject: [PATCH] nixStable: make an alias of nix

---
 pkgs/development/tools/misc/hydra/default.nix | 2 +-
 pkgs/tools/package-management/nix/default.nix | 4 +---
 pkgs/top-level/aliases.nix                    | 3 ++-
 pkgs/top-level/all-packages.nix               | 1 -
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix
index ac5600519b49..f0786d54b4fd 100644
--- a/pkgs/development/tools/misc/hydra/default.nix
+++ b/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 {
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 58bbee290535..7643f9836b8a 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/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";
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 2c33cff14a08..7d9d56ba2696 100644
--- a/pkgs/top-level/aliases.nix
+++ b/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
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 387c26cdbe96..ea9e1340f99b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/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