From 7366cd77ccdeee80b1edd1b4621f9c5daa88e42d Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <bernardo@meurer.org>
Date: Mon, 24 Jan 2022 18:03:13 -0800
Subject: [PATCH] nix: 2.5.1 -> 2.6.0

---
 pkgs/tools/package-management/nix/default.nix | 18 +++++++++++++++++-
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 4cf6ef23b654..cff152371bb9 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -229,7 +229,7 @@ in rec {
 
   nix = nixStable;
 
-  nixStable = nix_2_5;
+  nixStable = nix_2_6;
 
   nix_2_3 = callPackage common (rec {
     pname = "nix";
@@ -280,6 +280,22 @@ in rec {
     inherit storeDir stateDir confDir;
   });
 
+  nix_2_6 = callPackage common (rec {
+    pname = "nix";
+    version = "2.6.0";
+
+    src = fetchFromGitHub {
+      owner = "NixOS";
+      repo = "nix";
+      rev = version;
+      sha256 = "sha256-xEPeMcNJVOeZtoN+d+aRwolpW8mFSEQx76HTRdlhPhg=";
+    };
+
+    boehmgc = boehmgc_nix;
+
+    inherit storeDir stateDir confDir;
+  });
+
   nixUnstable = lib.lowPrio (callPackage common rec {
     pname = "nix";
     version = "2.6${suffix}";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d3bf1f622988..34785c815696 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -33091,6 +33091,7 @@ with pkgs;
     nix_2_3
     nix_2_4
     nix_2_5
+    nix_2_6
     nixUnstable;
 
   nixStatic = pkgsStatic.nix;