diff options
| author | sternenseemann <sternenseemann@systemli.org> | 2022-01-29 21:41:49 +0100 |
|---|---|---|
| committer | sternenseemann <sternenseemann@systemli.org> | 2022-01-29 21:41:49 +0100 |
| commit | e3d8cc81b37a566d781199dab9d342822393b91f (patch) | |
| tree | 8bc0ae0a9c8b285dd6830a9f9699ac78f548e568 /nixos | |
| parent | c8206d353431ef247cdfaf044323c28ddc4c2954 (diff) | |
| download | nixpkgs-e3d8cc81b37a566d781199dab9d342822393b91f.tar nixpkgs-e3d8cc81b37a566d781199dab9d342822393b91f.tar.gz nixpkgs-e3d8cc81b37a566d781199dab9d342822393b91f.tar.bz2 nixpkgs-e3d8cc81b37a566d781199dab9d342822393b91f.tar.lz nixpkgs-e3d8cc81b37a566d781199dab9d342822393b91f.tar.xz nixpkgs-e3d8cc81b37a566d781199dab9d342822393b91f.tar.zst nixpkgs-e3d8cc81b37a566d781199dab9d342822393b91f.zip | |
nixos/nix-daemon: fix config validation with 2.3
--option experimental-features is no understood by Nix 2.3.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/misc/nix-daemon.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index cd4408cef41..111a2ad5040 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 |