Merge pull request #6792 from NixOS/backport-6791-to-2.10-maintenance

[Backport 2.10-maintenance] Fix --no-daemon installation
Fix --no-daemon installation
2022-07-12 17:33:58 +02:00 · 2022-07-12 15:01:03 +00:00 · 2022-07-11 23:42:02 +02:00 · 2022-07-11 21:56:44 +02:00
4 changed files with 5 additions and 4 deletions
--- a/.version
+++ b/.version
@@ -1 +1 @@
-2.10.0
+2.10.1
--- a/doc/manual/src/SUMMARY.md.in
+++ b/doc/manual/src/SUMMARY.md.in
@@ -71,7 +71,6 @@
  - [Hacking](contributing/hacking.md)
  - [CLI guideline](contributing/cli-guideline.md)
 - [Release Notes](release-notes/release-notes.md)
-  - [Release X.Y (202?-??-??)](release-notes/rl-next.md)
  - [Release 2.10 (2022-07-11)](release-notes/rl-2.10.md)
  - [Release 2.9 (2022-05-30)](release-notes/rl-2.9.md)
  - [Release 2.8 (2022-04-19)](release-notes/rl-2.8.md)
--- a/flake.nix
+++ b/flake.nix
@@ -15,7 +15,7 @@
        then ""
        else "pre${builtins.substring 0 8 (self.lastModifiedDate or self.lastModified or "19700101")}_${self.shortRev or "dirty"}";

-      officialRelease = false;
+      officialRelease = true;

      linux64BitSystems = [ "x86_64-linux" "aarch64-linux" ];
      linuxSystems = linux64BitSystems ++ [ "i686-linux" ];
--- a/scripts/install-nix-from-closure.sh
+++ b/scripts/install-nix-from-closure.sh
@@ -148,7 +148,9 @@ if ! [ -w "$dest" ]; then
    exit 1
 fi

-mkdir -p "$dest/store"
+# The auto-chroot code in openFromNonUri() checks for the
+# non-existence of /nix/var/nix, so we need to create it here.
+mkdir -p "$dest/store" "$dest/var/nix"

 printf "copying Nix to %s..." "${dest}/store" >&2
 # Insert a newline if no progress is shown.
Author	SHA1	Message	Date
Eelco Dolstra	682e5e6aff	Merge pull request #6792 from NixOS/backport-6791-to-2.10-maintenance [Backport 2.10-maintenance] Fix --no-daemon installation	2022-07-12 17:33:58 +02:00
Eelco Dolstra	077c4d6077	Fix --no-daemon installation It was accidentally triggering the auto-chroot code path because /nix/var/nix didn't exist. Fixes #6790. (cherry picked from commit `c9d406ba04`)	2022-07-12 15:01:03 +00:00
Eelco Dolstra	17221783ef	Bump version	2022-07-11 23:42:02 +02:00
Eelco Dolstra	b9cf655150	Mark official release	2022-07-11 21:56:44 +02:00
@@ -1 +1 @@
 .10.0
 .10.1