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

Commits on Dec 7, 2019

  1. buildImageWithNixDb: export USER (#74959) 

    dockerTools.buildImageWithNixDb: export USER

Changes to Nix user detection (./src/nix-channel/nix-channel.cc#L-166)
cause this function to error. Exporting USER fixes this.
    @tomberek @nlewo
    tomberek authored and nlewo committed Dec 7, 2019
    Copy the full SHA
    81b0a20 View commit details
Showing with 3 additions and 0 deletions.
  1. +3 −0 pkgs/build-support/docker/default.nix
3 changes: 3 additions & 0 deletions pkgs/build-support/docker/default.nix
View file
Original file line number Diff line number Diff line change
@@ -845,6 +845,9 @@ rec {
echo " be better to only have one layer that contains a nix store."
export NIX_REMOTE=local?root=$PWD
# A user is required by nix
# https://github.com/NixOS/nix/blob/9348f9291e5d9e4ba3c4347ea1b235640f54fd79/src/libutil/util.cc#L478
export USER=nobody
${nix}/bin/nix-store --load-db < ${closureInfo {rootPaths = contentsList;}}/registration
mkdir -p nix/var/nix/gcroots/docker/