make-tarball.nix: Fix running as root
Since Nix now runs builds in a user namespace with uid == 0, this triggered the message warning: the group ‘nixbld’ specified in ‘build-users-group’ does not exist which make-tarball.nix turns into a fatal error. So clear build-users-group. http://hydra.nixos.org/build/44817408
This commit is contained in:
@@ -35,6 +35,7 @@ releaseTools.sourceTarball rec {
|
|||||||
export NIX_DB_DIR=$TMPDIR
|
export NIX_DB_DIR=$TMPDIR
|
||||||
export NIX_STATE_DIR=$TMPDIR
|
export NIX_STATE_DIR=$TMPDIR
|
||||||
export NIX_PATH=nixpkgs=$TMPDIR/barf.nix
|
export NIX_PATH=nixpkgs=$TMPDIR/barf.nix
|
||||||
|
opts=(--option build-users-group "")
|
||||||
nix-store --init
|
nix-store --init
|
||||||
|
|
||||||
echo 'abort "Illegal use of <nixpkgs> in Nixpkgs."' > $TMPDIR/barf.nix
|
echo 'abort "Illegal use of <nixpkgs> in Nixpkgs."' > $TMPDIR/barf.nix
|
||||||
@@ -68,7 +69,8 @@ releaseTools.sourceTarball rec {
|
|||||||
|
|
||||||
nix-env -f . \
|
nix-env -f . \
|
||||||
--show-trace --argstr system "$platform" \
|
--show-trace --argstr system "$platform" \
|
||||||
-qa --drv-path --system-filter \* --system 2>&1 >/dev/null | tee eval-warnings.log
|
-qa --drv-path --system-filter \* --system \
|
||||||
|
"''${opts[@]}" 2>&1 >/dev/null | tee eval-warnings.log
|
||||||
|
|
||||||
if [ -s eval-warnings.log ]; then
|
if [ -s eval-warnings.log ]; then
|
||||||
echo "Nixpkgs on $platform evaluated with warnings, aborting"
|
echo "Nixpkgs on $platform evaluated with warnings, aborting"
|
||||||
@@ -78,7 +80,8 @@ releaseTools.sourceTarball rec {
|
|||||||
|
|
||||||
nix-env -f . \
|
nix-env -f . \
|
||||||
--show-trace --argstr system "$platform" \
|
--show-trace --argstr system "$platform" \
|
||||||
-qa --drv-path --system-filter \* --system --meta --xml > /dev/null
|
-qa --drv-path --system-filter \* --system --meta --xml \
|
||||||
|
"''${opts[@]}" > /dev/null
|
||||||
stopNest
|
stopNest
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user