Comparing changes
Open a pull request
base repository: NixOS/nixpkgs-channels
base: 21293d2576ac
head repository: NixOS/nixpkgs-channels
compare: 1ada6fcde10a
- 7 commits
- 5 files changed
- 3 contributors
Commits on Oct 8, 2018
-
Configuration menu - View commit details
-
Copy full SHA for 41cc5c4 - Browse repository at this point
Copy the full SHA 41cc5c4View commit details -
openssh: fix tunnel forwarding (upstream patch)
Close #48031, fixes #48016. I didn't use the PR commit because I think it's better to fetch the patch. (cherry picked from commit c2e6ca5)
Configuration menu - View commit details
-
Copy full SHA for 3ab942e - Browse repository at this point
Copy the full SHA 3ab942eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 3cee341 - Browse repository at this point
Copy the full SHA 3cee341View commit details -
debian vm tools: use snapshot.debian.org
snapshot.debian.org actually keeps track of all of the updates as they come in rather than doing arbitrary (?) snapshots. (cherry picked from commit 9cc18fa)
Configuration menu - View commit details
-
Copy full SHA for d0b24be - Browse repository at this point
Copy the full SHA d0b24beView commit details -
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)
Configuration menu - View commit details
-
Copy full SHA for 76c1cd3 - Browse repository at this point
Copy the full SHA 76c1cd3View commit details -
Revert "Revert "Revert "doc: Update section about imperative containe…
Configuration menu - View commit details
-
Copy full SHA for cf9b801 - Browse repository at this point
Copy the full SHA cf9b801View commit details -
nixos/containers: Add regression test for #40355
(cherry picked from commit 0668906)
Configuration menu - View commit details
-
Copy full SHA for 1ada6fc - Browse repository at this point
Copy the full SHA 1ada6fcView commit details
This comparison is taking too long to generate.
Unfortunately it looks like we can’t render this comparison for you right now. It might be too big, or there might be something weird with your repository.
You can try running this command locally to see the comparison on your machine:
git diff 21293d2576ac...1ada6fcde10a