Skip to content
This repository was 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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c5bb386bab79
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 58a9acf75a3d
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Feb 23, 2020

  1. maintainers: correct my name stylization 

    Out of many variations, it's almost never like that.

(cherry picked from commit c0c1f11)
    @worldofpeace
    worldofpeace committed Feb 23, 2020
    Copy the full SHA
    ee9e9a6 View commit details

  2. runInLinuxVM: Ensure tools requiring /etc/passwd work 

    This includes, but is not limited to:

 * whoami
 * nix >= 2.3.1

See

 * NixOS/nixpkgs#71157
 * NixOS/nixops#1216
 * nix-community/nixops-libvirtd#5

(cherry picked from commit 687e219)
    @samueldr
    samueldr committed Feb 23, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    58a9acf View commit details
Showing with 5 additions and 1 deletion.
  1. +1 −1 maintainers/maintainer-list.nix
  2. +4 −0 pkgs/build-support/vm/default.nix
2 changes: 1 addition & 1 deletion maintainers/maintainer-list.nix
View file
Original file line number Diff line number Diff line change
@@ -6906,7 +6906,7 @@
email = "worldofpeace@protonmail.ch";
github = "worldofpeace";
githubId = 28888242;
name = "Worldofpeace";
name = "worldofpeace";
};
wscott = {
email = "wsc9tt@gmail.com";
4 changes: 4 additions & 0 deletions pkgs/build-support/vm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -126,6 +126,10 @@ rec {
mkdir -p /fs/etc
ln -sf /proc/mounts /fs/etc/mtab
echo "127.0.0.1 localhost" > /fs/etc/hosts
# Ensures tools requiring /etc/passwd will work (e.g. nix)
if [ ! -e /fs/etc/passwd ]; then
echo "root:x:0:0:System administrator:/root:/bin/sh" > /fs/etc/passwd
fi
echo "starting stage 2 ($command)"
exec switch_root /fs $command $out