Skip to content
This repository has been archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
base: d0b24be55da0
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 01762972bece
Choose a head ref
  • 4 commits
  • 4 files changed
  • 2 contributors

Commits on Oct 8, 2018

  1. nixos-container: Force container to talk to host nix-daemon

    When logging into a container by using
      nixos-container root-login
    all nix-related commands in the container would fail, as they
    tried to modify the nix db and nix store, which are mounted
    read-only in the container.  We want nixos-container to not
    try to modify the nix store at all, but instead delegate
    any build commands to the nix daemon of the host operating system.
    
    This already works for non-root users inside a nixos-container,
    as it doesn't 'own' the nix-store, and thus defaults
    to talking to the daemon socket at /nix/var/nix/daemon-socket/,
    which is bind-mounted to the host daemon-socket, causing all nix
    commands to be delegated to the host.
    
    However, when we are the root user inside the container, we have the
    same uid as the nix store owner, eventhough it's not actually
    the same root user (due to user namespaces). Nix gets confused,
    and is convinced it's running in single-user mode, and tries
    to modify the nix store directly instead.
    
    By setting `NIX_REMOTE=daemon` in `/etc/profile`, we force nix
    to operate in multi-user mode, so that it will talk to the host
    daemon instead, which will modify the nix store for the container.
    
    This fixes #40355
    
    (cherry picked from commit 3624bb5)
    arianvp authored and samueldr committed Oct 8, 2018
    Configuration menu
    Copy the full SHA
    76c1cd3 View commit details
    Browse the repository at this point in the history
  2. Revert "Revert "Revert "doc: Update section about imperative containe…

    …rs"""
    
    nixos-container can now execute nix commands again inside the container
    
    This reverts commit 9622cd3.
    
    (cherry picked from commit bb31835)
    arianvp authored and samueldr committed Oct 8, 2018
    Configuration menu
    Copy the full SHA
    cf9b801 View commit details
    Browse the repository at this point in the history
  3. nixos/containers: Add regression test for #40355

    (cherry picked from commit 0668906)
    arianvp authored and samueldr committed Oct 8, 2018
    Configuration menu
    Copy the full SHA
    1ada6fc View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2018

  1. sbt: 1.2.3 -> 1.2.4

    (cherry picked from commit 844bcbd)
    NeQuissimus committed Oct 9, 2018
    Configuration menu
    Copy the full SHA
    0176297 View commit details
    Browse the repository at this point in the history