diff options
| author | Silvan Mosberger <contact@infinisil.com> | 2019-10-02 23:15:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-02 23:15:13 +0200 |
| commit | 899937e1caa949198c0c9be797ca5598251647d8 (patch) | |
| tree | ab310a3711a91098bdfa6bbdbfa30126ac1e62e6 /nixos | |
| parent | 2b1e2f2e975e594bbb991b191357e292c1d775b1 (diff) | |
| parent | e463c7cd75f68e112b838252963ca20495903210 (diff) | |
| download | nixpkgs-899937e1caa949198c0c9be797ca5598251647d8.tar nixpkgs-899937e1caa949198c0c9be797ca5598251647d8.tar.gz nixpkgs-899937e1caa949198c0c9be797ca5598251647d8.tar.bz2 nixpkgs-899937e1caa949198c0c9be797ca5598251647d8.tar.lz nixpkgs-899937e1caa949198c0c9be797ca5598251647d8.tar.xz nixpkgs-899937e1caa949198c0c9be797ca5598251647d8.tar.zst nixpkgs-899937e1caa949198c0c9be797ca5598251647d8.zip | |
Merge pull request #69868 from Infinisil/config-check-warning
nixos/nix-daemon: Prevent network warning when checking config
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/misc/nix-daemon.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 3826f728afd..3263f695423 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -11,6 +11,7 @@ let nixVersion = getVersion nix; isNix20 = versionAtLeast nixVersion "2.0pre"; + isNix23 = versionAtLeast nixVersion "2.3pre"; makeNixBuildUser = nr: { name = "nixbld${toString nr}"; @@ -63,7 +64,7 @@ let builders = ''} system-features = ${toString cfg.systemFeatures} - ${optionalString (versionAtLeast nixVersion "2.3pre") '' + ${optionalString isNix23 '' sandbox-fallback = false ''} $extraOptions @@ -74,7 +75,7 @@ let '' else '' echo "Checking that Nix can read nix.conf..." ln -s $out ./nix.conf - NIX_CONF_DIR=$PWD ${cfg.package}/bin/nix show-config >/dev/null + NIX_CONF_DIR=$PWD ${cfg.package}/bin/nix show-config ${optionalString isNix23 "--no-net"} >/dev/null '') ); |