From da63ef8675e6490f59c23b16bbede664d41b88d6 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <mb@flyingcircus.io>
Date: Thu, 12 Dec 2024 11:14:08 +0100
Subject: [PATCH] pkgs/overlay: nix: 2.3.16 -> 2.3.18

PL-133165

Motivation here is to be able to substitute zstd-compressed paths to
increase the total throughput of our Hydra.

The entire diff from 2.3.16 to 2.3.18 can be reviewed at
https://github.com/NixOS/nix/compare/2.3.16...2.3.18

I went through the changes and didn't notice any notable changes that
I'd expect to be an issue.
---
 ...121806_PL-133165-nix-2.3-backport_scriv.md |  7 +++++
 pkgs/overlay.nix                              | 26 +++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 changelog.d/20241212_121806_PL-133165-nix-2.3-backport_scriv.md

diff --git a/changelog.d/20241212_121806_PL-133165-nix-2.3-backport_scriv.md b/changelog.d/20241212_121806_PL-133165-nix-2.3-backport_scriv.md
new file mode 100644
index 000000000..c2f42d856
--- /dev/null
+++ b/changelog.d/20241212_121806_PL-133165-nix-2.3-backport_scriv.md
@@ -0,0 +1,7 @@
+### Impact
+
+
+### NixOS XX.XX platform
+
+- Updated Nix to 2.3.18 to be able to download `zstd`-compressed paths from our Hydra. It will
+  switch from `xz` to `zstd` to increase its throughput.
diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix
index 8a9ec1efe..b08b73978 100644
--- a/pkgs/overlay.nix
+++ b/pkgs/overlay.nix
@@ -326,6 +326,32 @@ in {
     };
   });
 
+  nix = super.nix.overrideAttrs (old: rec {
+    name = "nix-${version}";
+    version = "2.3.18";
+    src = self.fetchFromGitHub {
+      owner = "NixOS";
+      repo = "nix";
+      rev = version;
+      hash = "sha256-jBz2Ub65eFYG+aWgSI3AJYvLSghio77fWQiIW1svA9U=";
+    };
+    nativeBuildInputs = (old.nativeBuildInputs or []) ++ [
+      self.libxslt
+      self.libxml2
+      self.docbook_xsl_ns
+      self.docbook5
+      self.bison
+      self.flex
+      self.jq
+      self.autoconf-archive
+      self.autoreconfHook
+    ];
+    buildInputs = (old.buildInputs or []) ++ [
+      self.libarchive
+      self.zstd
+    ];
+  });
+
   matrix-synapse = super.matrix-synapse.overrideAttrs(orig: rec {
     pname = "matrix-synapse";
     version = "1.47.1";