24 lines
1.2 KiB
Diff
24 lines
1.2 KiB
Diff
From e3d8cc81b37a566d781199dab9d342822393b91f Mon Sep 17 00:00:00 2001
|
|
From: sternenseemann <sternenseemann@systemli.org>
|
|
Date: Sat, 29 Jan 2022 21:41:49 +0100
|
|
Subject: [PATCH] nixos/nix-daemon: fix config validation with 2.3
|
|
|
|
--option experimental-features is no understood by Nix 2.3.
|
|
---
|
|
nixos/modules/services/misc/nix-daemon.nix | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
|
|
index cd4408cef411d..111a2ad504069 100644
|
|
--- a/nixos/modules/services/misc/nix-daemon.nix
|
|
+++ b/nixos/modules/services/misc/nix-daemon.nix
|
|
@@ -69,7 +69,8 @@ let
|
|
set -e
|
|
set +o pipefail
|
|
NIX_CONF_DIR=$PWD \
|
|
- ${cfg.package}/bin/nix show-config ${optionalString (isNixAtLeast "2.3pre") "--no-net --option experimental-features nix-command"} \
|
|
+ ${cfg.package}/bin/nix show-config ${optionalString (isNixAtLeast "2.3pre") "--no-net"} \
|
|
+ ${optionalString (isNixAtLeast "2.4pre") "--option experimental-features nix-command"} \
|
|
|& sed -e 's/^warning:/error:/' \
|
|
| (! grep '${if cfg.checkConfig then "^error:" else "^error: unknown setting"}')
|
|
set -o pipefail
|