Merge pull request #69868 from Infinisil/config-check-warning

nixos/nix-daemon: Prevent network warning when checking config
This commit is contained in:
Silvan Mosberger 2019-10-02 23:15:13 +02:00 committed by GitHub
commit 899937e1ca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -11,6 +11,7 @@ let
nixVersion = getVersion nix; nixVersion = getVersion nix;
isNix20 = versionAtLeast nixVersion "2.0pre"; isNix20 = versionAtLeast nixVersion "2.0pre";
isNix23 = versionAtLeast nixVersion "2.3pre";
makeNixBuildUser = nr: makeNixBuildUser = nr:
{ name = "nixbld${toString nr}"; { name = "nixbld${toString nr}";
@ -63,7 +64,7 @@ let
builders = builders =
''} ''}
system-features = ${toString cfg.systemFeatures} system-features = ${toString cfg.systemFeatures}
${optionalString (versionAtLeast nixVersion "2.3pre") '' ${optionalString isNix23 ''
sandbox-fallback = false sandbox-fallback = false
''} ''}
$extraOptions $extraOptions
@ -74,7 +75,7 @@ let
'' else '' '' else ''
echo "Checking that Nix can read nix.conf..." echo "Checking that Nix can read nix.conf..."
ln -s $out ./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
'') '')
); );