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: 798a2a6c97ff
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 331755f959b3
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 26, 2018

  1. nixos/containers: simplify env var definition 

    Also clear up the misleading comment: This env var isn't
root-specific, it's needed for all users.
    @erikarvstedt
    erikarvstedt committed Nov 26, 2018
    Copy the full SHA
    c64a971 View commit details

Commits on Nov 27, 2018

  1. Merge pull request #51085 from erikarvstedt/container-config 

    containers: simplify env var definition
    @infinisil
    infinisil authored Nov 27, 2018
    Copy the full SHA
    331755f View commit details
Showing with 2 additions and 6 deletions.
  1. +2 −6 nixos/modules/virtualisation/container-config.nix
8 changes: 2 additions & 6 deletions nixos/modules/virtualisation/container-config.nix
View file
Original file line number Diff line number Diff line change
@@ -22,12 +22,8 @@ with lib;
# Not supported in systemd-nspawn containers.
security.audit.enable = false;

# Make sure that root user in container will talk to host nix-daemon
environment.etc."profile".text = ''
export NIX_REMOTE=daemon
'';


# Use the host's nix-daemon.
environment.variables.NIX_REMOTE = "daemon";

};