From 07031c29857b2be3b9ed5cf70934901827eb9f81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 10 Nov 2023 21:48:56 +0100 Subject: [PATCH] nix: fix build --- overlays/default.nix | 1 - overlays/nix-increase-substituter-threadpool.diff | 14 -------------- 2 files changed, 15 deletions(-) delete mode 100644 overlays/nix-increase-substituter-threadpool.diff diff --git a/overlays/default.nix b/overlays/default.nix index 5fe827bc..fc7a67ba 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -101,7 +101,6 @@ with final; { nixVersions = prev.nixVersions // { stable = (prev.nixVersions.stable.override { withAWS = false; }).overrideAttrs ({ patches ? [ ], ...}: { patches = patches ++ [ - ./nix-increase-substituter-threadpool.diff # request compression (fetchpatch { url = "https://github.com/NixOS/nix/pull/7712.patch"; diff --git a/overlays/nix-increase-substituter-threadpool.diff b/overlays/nix-increase-substituter-threadpool.diff deleted file mode 100644 index 9e243274..00000000 --- a/overlays/nix-increase-substituter-threadpool.diff +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/libstore/misc.cc b/src/libstore/misc.cc -index fb985c97b..a509d6f4d 100644 ---- a/src/libstore/misc.cc -+++ b/src/libstore/misc.cc -@@ -102,7 +102,8 @@ void Store::queryMissing(const std::vector & targets, - downloadSize_ = narSize_ = 0; - - // FIXME: make async. -- ThreadPool pool(fileTransferSettings.httpConnections); -+ // https://github.com/NixOS/nix/issues/5118 -+ ThreadPool pool(300); - - struct State - {