From e4d25f9d5a762dd4682796f2bd1b3ca8403919b8 Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <bernardo@meurer.org>
Date: Mon, 24 Jan 2022 23:30:55 -0800
Subject: [PATCH] nix: move declaration to top-level/all-packages

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

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 7643f9836b8a..c600bca83e79 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -43,9 +43,7 @@ let
       inherit boehmgc patches Security;
       inherit storeDir stateDir confDir;
     };
-in rec {
-  nix = nix_2_5;
-
+in {
   nix_2_3 = buildNix rec {
     version = "2.3.16";
     src = fetchurl {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ea9e1340f99b..3c7d56d363c9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -33133,13 +33133,14 @@ with pkgs;
       stateDir = config.nix.stateDir or "/nix/var";
       inherit (darwin.apple_sdk.frameworks) Security;
       })
-    nix
     nix_2_3
     nix_2_4
     nix_2_5
     nix_2_6
     nixUnstable;
 
+  nix = nix_2_5;
+
   nixStatic = pkgsStatic.nix;
 
   nixops = callPackage ../tools/package-management/nixops { };