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: 07508cce16fd
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d3185b1f31d1
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 25, 2019

  1. nix-daemon.nix: Fix checkConfig 

    (cherry picked from commit 52e739c)
    @edolstra
    edolstra committed Oct 25, 2019
    Copy the full SHA
    d3185b1 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 nixos/modules/services/misc/nix-daemon.nix
2 changes: 1 addition & 1 deletion nixos/modules/services/misc/nix-daemon.nix
View file
Original file line number Diff line number Diff line change
@@ -75,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 ${optionalString isNix23 "--no-net"} >/dev/null
NIX_CONF_DIR=$PWD ${cfg.package}/bin/nix show-config ${optionalString isNix23 "--no-net --option experimental-features nix-command"} >/dev/null
'')
);