Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2b1e2f2e975e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 899937e1caa9
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 28, 2019

  1. nixos/nix-daemon: Prevent network warning when checking config 

    Since version 2.3 (NixOS/nix#2949 which was
cherry-picked to master) Nix issues a warning when --no-net wasn't
passed and there is no network interface. This commit adds the --no-net
flag to the nix.conf check such that no warning is issued.
    @infinisil
    infinisil committed Sep 28, 2019
    Copy the full SHA
    e463c7c View commit details

Commits on Oct 2, 2019

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

    nixos/nix-daemon: Prevent network warning when checking config
    @infinisil
    infinisil authored Oct 2, 2019
    Copy the full SHA
    899937e View commit details
Showing with 3 additions and 2 deletions.
  1. +3 −2 nixos/modules/services/misc/nix-daemon.nix
5 changes: 3 additions & 2 deletions nixos/modules/services/misc/nix-daemon.nix
View file
Original file line number Diff line number Diff line change
@@ -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
'')
);