From 9e16a0c068651a48e928142c2fad3bc4263fe5e6 Mon Sep 17 00:00:00 2001 From: Antoine Viallon Date: Sat, 25 May 2024 13:38:21 +0200 Subject: [PATCH] [Nix] fix infinite recursion (disable "cgroups" experimental setting) --- nix/nix.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nix/nix.nix b/nix/nix.nix index 2f334f3..d6c4f5e 100644 --- a/nix/nix.nix +++ b/nix/nix.nix @@ -85,7 +85,7 @@ in }; - nix.package = optimizePkg { lto = true; level = "slower"; } pkgs.nixVersions.latest; + nix.package = optimizePkg { level = "slower"; } pkgs.nixVersions.latest; nix.settings.system-features = [ "big-parallel" "kvm" "benchmark" ] ++ optional ( ! isNull generalCfg.cpu.arch ) "gccarch-${generalCfg.cpu.arch}" @@ -99,8 +99,8 @@ in nix.settings.experimental-features = [ "nix-command" "flakes" ] ++ optional (versionOlder config.nix.package.version "2.19") "repl-flake" ++ optional cfg.contentAddressed "ca-derivations" - ++ optional (config.nix.settings.use-cgroups or false) "cgroups"; - + ; + nix.settings.download-attempts = 5; nix.settings.stalled-download-timeout = 20;