From fe5e97cd74ba488030b2a07c4e58f4a4a3d65b6e Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Mon, 4 Oct 2021 21:46:43 +0200
Subject: [PATCH 1/3] lowdown-0-9: init at 0.9.0

Backport 6ea6a232cc62269866b5690094015fcab2184e18 as a separate
attribute to save us from a breaking change (newer version needed
by nixUnstable).
---
 pkgs/tools/typesetting/lowdown/0.9.x.nix | 12 ++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/tools/typesetting/lowdown/0.9.x.nix

diff --git a/pkgs/tools/typesetting/lowdown/0.9.x.nix b/pkgs/tools/typesetting/lowdown/0.9.x.nix
new file mode 100644
index 00000000000..1e1b4aad181
--- /dev/null
+++ b/pkgs/tools/typesetting/lowdown/0.9.x.nix
@@ -0,0 +1,12 @@
+# Latest version of lowdown, backported from unstable separately due to breaking changes
+{ lowdown
+, fetchurl
+}:
+
+lowdown.overrideAttrs (_: rec {
+  version = "0.9.0";
+  src = fetchurl {
+    url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz";
+    sha512 = "0v3l70c9mal67i369bk3q67qyn07kmclybcd5lj5ibdrrccq1jzsxn2sy39ziy77in7cygcb1lgf9vzacx9rscw94i6259fy0dpnf0h";
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3470d482a8c..cd7b710e3b1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2858,6 +2858,8 @@ in
 
   lowdown = callPackage ../tools/typesetting/lowdown { };
 
+  lowdown-0-9 = lowPrio (callPackage ../tools/typesetting/lowdown/0.9.x.nix { });
+
   numatop = callPackage ../os-specific/linux/numatop { };
 
   numworks-udev-rules = callPackage ../os-specific/linux/numworks-udev-rules { };

From a8dc6be3c8b43bfed48da810bdeb8f8c0bd205c7 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Mon, 27 Sep 2021 11:12:47 +0200
Subject: [PATCH 2/3] nixUnstable: 2.4pre20210922 -> 2.4pre20211001

Now depends on lowdown >= 0.9.

(cherry picked from commit 25da0b3bbbeb703285a493c0773dcccf3d46009b)
---
 pkgs/tools/package-management/nix/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index a5fb98d7557..fa846f2f471 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -14,7 +14,7 @@ common =
   , pkg-config, boehmgc, libsodium, brotli, boost, editline, nlohmann_json
   , autoreconfHook, autoconf-archive, bison, flex
   , jq, libarchive, libcpuid
-  , lowdown, mdbook
+  , lowdown-0-9, mdbook
   # Used by tests
   , gtest
   , busybox-sandbox-shell
@@ -45,7 +45,7 @@ common =
           [ autoreconfHook
             autoconf-archive
             bison flex
-            (lib.getBin lowdown) mdbook
+            (lib.getBin lowdown-0-9) mdbook
             jq
            ];
 
@@ -55,7 +55,7 @@ common =
         ]
         ++ lib.optionals stdenv.isDarwin [ Security ]
         ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
-        ++ lib.optionals is24 [ libarchive gtest lowdown ]
+        ++ lib.optionals is24 [ libarchive gtest lowdown-0-9 ]
         ++ lib.optional (is24 && stdenv.isx86_64) libcpuid
         ++ lib.optional withLibseccomp libseccomp
         ++ lib.optional withAWS
@@ -228,13 +228,13 @@ in rec {
   nixUnstable = lib.lowPrio (callPackage common rec {
     pname = "nix";
     version = "2.4${suffix}";
-    suffix = "pre20210922_${lib.substring 0 7 src.rev}";
+    suffix = "pre20211001_${lib.substring 0 7 src.rev}";
 
     src = fetchFromGitHub {
       owner = "NixOS";
       repo = "nix";
-      rev = "bcd73ebf60bb9ba6cb09f8df4366d5474c16e4a4";
-      sha256 = "sha256-wRbz8c22tlRn2/va/yOoLJijdJn+JJqLRDPRlifaEEA=";
+      rev = "4f496150eb4e0012914c11f0a3ff4df2412b1d09";
+      sha256 = "00hxxk66f068588ymv60ygib6vgk7c97s9yia3qd561679rq3nsj";
     };
 
     boehmgc = boehmgc_nixUnstable;

From 4bf640bb9be6f1c5a7d1a0340b771c5d5f1a2e50 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Wed, 6 Oct 2021 21:41:51 +0100
Subject: [PATCH 3/3] 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;