From 07fdb608f741ccde87d1a8a03df4188c16fe3a88 Mon Sep 17 00:00:00 2001 From: Default email Date: Thu, 27 Jan 2022 10:19:43 +1000 Subject: [PATCH] Project import generated by Copybara. GitOrigin-RevId: 5bb20f9dc70e9ee16e21cc404b6508654931ce41 --- third_party/nixpkgs/nixos/modules/services/misc/nix-daemon.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/third_party/nixpkgs/nixos/modules/services/misc/nix-daemon.nix b/third_party/nixpkgs/nixos/modules/services/misc/nix-daemon.nix index cd4408cef4..111a2ad504 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/nix-daemon.nix +++ b/third_party/nixpkgs/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