diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2018-08-30T19·18+0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2018-08-30T19·18+0200 |
| commit | 39f1722f364d7ce95717161cc283e96250c14643 (patch) | |
| tree | 15babbbf62f23a7253787ea1b984f61017b69009 /release.nix | |
| parent | f08b14c9d0e0a1d24b0a5d231ba7d448ef000106 (diff) | |
nix upgrade-nix: Handle .nix-profile being a link to .../profiles/per-user/...
Also some cosmetic improvements.
Diffstat (limited to 'release.nix')
| -rw-r--r-- | release.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/release.nix b/release.nix index fdf3fa946aa8..e359ebcb2ce3 100644 --- a/release.nix +++ b/release.nix @@ -241,6 +241,7 @@ let { diskImage = vmTools.diskImages.ubuntu1204x86_64; } '' + set -x useradd -m alice su - alice -c 'tar xf ${binaryTarball.x86_64-linux}/*.tar.*' mkdir /dest-nix @@ -251,14 +252,13 @@ let su - alice -c 'PAGER= nix-store -qR ${build.x86_64-linux}' # Check whether 'nix upgrade-nix' works. - (! [ -L /nix/var/nix/profiles/per-user/alice/profile-2-link ]) cat > /tmp/paths.nix <<EOF { x86_64-linux = "${build.x86_64-linux}"; } EOF su - alice -c 'nix upgrade-nix -vvv --nix-store-paths-url file:///tmp/paths.nix' - [ -L /nix/var/nix/profiles/per-user/alice/profile-2-link ] + (! [ -L /home/alice/.profile-1-link ]) su - alice -c 'PAGER= nix-store -qR ${build.x86_64-linux}' mkdir -p $out/nix-support |