From 6b3a2e6c3f7a483fcf41b73611cee248d10ae558 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 30 Jan 2022 12:28:55 +0100
Subject: [PATCH] nixUnstable: pre20220124 -> pre20220127

fixes https://github.com/NixOS/nix/issues/5998
and https://github.com/NixOS/nix/issues/5980
---
 pkgs/tools/package-management/nix/common.nix  | 3 +++
 pkgs/tools/package-management/nix/default.nix | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix
index ba95e0ddbf433..fb4398322acbb 100644
--- a/pkgs/tools/package-management/nix/common.nix
+++ b/pkgs/tools/package-management/nix/common.nix
@@ -9,6 +9,7 @@ assert (sha256 == null) -> (src != null);
 let
   atLeast24 = lib.versionAtLeast version "2.4pre";
   atLeast25 = lib.versionAtLeast version "2.5pre";
+  atLeast27 = lib.versionAtLeast version "2.7pre";
 in
 { stdenv
 , autoconf-archive
@@ -100,6 +101,8 @@ stdenv.mkDerivation {
     lowdown
   ] ++ lib.optionals (atLeast24 && stdenv.isx86_64) [
     libcpuid
+  ] ++ lib.optional (atLeast27) [
+    nlohmann_json
   ] ++ lib.optionals withLibseccomp [
     libseccomp
   ] ++ lib.optionals withAWS [
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 51f09e5dc4379..f389da8b4b0b2 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -67,12 +67,12 @@ in lib.makeExtensible (self: {
 
   unstable = lib.lowPrio (common rec {
     version = "2.7";
-    suffix = "pre20220124_${lib.substring 0 7 src.rev}";
+    suffix = "pre20220127_${lib.substring 0 7 src.rev}";
     src = fetchFromGitHub {
       owner = "NixOS";
       repo = "nix";
-      rev = "0a70b37b5694c769fb855c1afe7642407d1db64f";
-      sha256 = "sha256-aOM9MPNlnWNMobx4CuD4JIXH2poRlG8AKkuxY7FysWg=";
+      rev = "558c4ee3e370c9f9a6ea293df54ed6914a999f1c";
+      sha256 = "sha256-hMzKQflpgf3P7OdYKSnD1VMBSnF48XSRjaNX3bUJct4=";
     };
   });
 })