From 4bf640bb9be6f1c5a7d1a0340b771c5d5f1a2e50 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 6 Oct 2021 21:41:51 +0100 Subject: [PATCH] nixUnstable: pre20211001 -> pre20211006 The specific reason to update is to pull in logging fix: c6718a9d950214 "Don't reset the logger in a vfork" Otherwise 'nix build' does not report build progress correctly. (cherry picked from commit 5323bc0f144890c23915e8d54d996a5cff97a05c) --- pkgs/tools/package-management/nix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index fa846f2f471..b08b33f816e 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -228,13 +228,13 @@ in rec { nixUnstable = lib.lowPrio (callPackage common rec { pname = "nix"; version = "2.4${suffix}"; - suffix = "pre20211001_${lib.substring 0 7 src.rev}"; + suffix = "pre20211006_${lib.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "4f496150eb4e0012914c11f0a3ff4df2412b1d09"; - sha256 = "00hxxk66f068588ymv60ygib6vgk7c97s9yia3qd561679rq3nsj"; + rev = "53e479428958b39a126ce15de85d7397fdcfe2e1"; + sha256 = "18mm3f0n964msj5bha6wpnwckg5lwjwdm6r7frrwdj75v10jiyb7"; }; boehmgc = boehmgc_nixUnstable;