nix: move declaration to top-level/all-packages

2 years ago · e4d25f9d5a
parent 5210313299
commit e4d25f9d5a
2 changed files with 3 additions and 4 deletions
--- 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 {
--- 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 { };