Disable auto-chroot if $NIX_STATE_DIR is set

Issue #6732. (cherry picked from commit 3bcd7a5474)
Disable auto-chroot if $NIX_STORE_DIR is set
2022-07-15 14:01:52 +02:00 · 2022-07-15 14:01:46 +02:00 · 2022-07-15 12:25:01 +02:00 · 2022-07-14 19:30:35 -05:00 · 2022-07-14 13:56:13 +02:00 · 2022-07-13 15:28:57 -05:00
6 changed files with 16 additions and 10 deletions
--- a/.version
+++ b/.version
@@ -1 +1 @@
-2.10.0
+2.10.3
--- 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.lock
+++ b/flake.lock
@@ -18,11 +18,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1653988320,
-        "narHash": "sha256-ZaqFFsSDipZ6KVqriwM34T739+KLYJvNmCWzErjAg7c=",
+        "lastModified": 1657693803,
+        "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "2fa57ed190fd6c7c746319444f34b5917666e5c1",
+        "rev": "365e1b3a859281cf11b94f87231adeabbdd878a2",
        "type": "github"
      },
      "original": {
--- 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" ];
@@ -108,7 +108,7 @@
          ++ lib.optionals stdenv.hostPlatform.isLinux [(buildPackages.util-linuxMinimal or buildPackages.utillinuxMinimal)];

        buildDeps =
-          [ curl
+          [ (curl.override { patchNetrcRegression = true; })
            bzip2 xz brotli editline
            openssl sqlite
            libarchive
@@ -363,7 +363,7 @@

              buildInputs =
                [ nix
-                  curl
+                  (curl.override { patchNetrcRegression = true; })
                  bzip2
                  xz
                  pkgs.perl
--- 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.
--- a/src/libstore/store-api.cc
+++ b/src/libstore/store-api.cc
@@ -1321,7 +1321,12 @@ std::shared_ptr<Store> openFromNonUri(const std::string & uri, const Store::Para
        else if (pathExists(settings.nixDaemonSocketFile))
            return std::make_shared<UDSRemoteStore>(params);
        #if __linux__
-        else if (!pathExists(stateDir) && params.empty() && getuid() != 0) {
+        else if (!pathExists(stateDir)
+            && params.empty()
+            && getuid() != 0
+            && !getEnv("NIX_STORE_DIR").has_value()
+            && !getEnv("NIX_STATE_DIR").has_value())
+        {
            /* If /nix doesn't exist, there is no daemon socket, and
               we're not root, then automatically set up a chroot
               store in ~/.local/share/nix/root. */
Author	SHA1	Message	Date
Eelco Dolstra	0b62dab6db	Disable auto-chroot if $NIX_STATE_DIR is set Issue #6732. (cherry picked from commit `3bcd7a5474`)	2022-07-15 14:01:52 +02:00
Eelco Dolstra	1722de647b	Disable auto-chroot if $NIX_STORE_DIR is set Fixes #6732. (cherry picked from commit `ff49c75502`)	2022-07-15 14:01:46 +02:00
Eelco Dolstra	b48683b7fd	Bump version	2022-07-15 12:25:01 +02:00
Domen Kožar	1258f2b7f8	curl: patch for netrc regression in Nix (cherry picked from commit `99208bb8cc`) Signed-off-by: Domen Kožar <domen@dev.si>	2022-07-14 19:30:35 -05:00
Eelco Dolstra	e79b38ef59	Bump version	2022-07-14 13:56:13 +02:00
Domen Kožar	39b996ca0c	bump nixpkgs to fix netrc regression in curl	2022-07-13 15:28:57 -05:00
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.3