set up builder pipe

2021-06-28 23:16:40 +02:00
103 changed files with 6217 additions and 12161 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -15,7 +15,6 @@ perl/Makefile.config
 /doc/manual/*.1
 /doc/manual/*.5
 /doc/manual/*.8
-/doc/manual/generated/*
 /doc/manual/nix.json
 /doc/manual/conf-file.json
 /doc/manual/builtins.json
@@ -77,6 +76,7 @@ perl/Makefile.config
 # /tests/
 /tests/test-tmp
 /tests/common.sh
+/tests/dummy
 /tests/result*
 /tests/restricted-innocent
 /tests/shell
--- a/3
+++ b/3
@@ -12,7 +12,6 @@ makefiles = \
  src/resolve-system-dependencies/local.mk \
  scripts/local.mk \
  misc/bash/local.mk \
-  misc/fish/local.mk \
  misc/zsh/local.mk \
  misc/systemd/local.mk \
  misc/launchd/local.mk \
@@ -33,4 +32,4 @@ endif

 include mk/lib.mk

-GLOBAL_CXXFLAGS += -g -Wall -include config.h -std=c++17 -I src
+GLOBAL_CXXFLAGS += -g -Wall -include config.h -std=c++17
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -1,4 +1,3 @@
-HOST_OS = @host_os@
 AR = @AR@
 BDW_GC_LIBS = @BDW_GC_LIBS@
 BOOST_LDFLAGS = @BOOST_LDFLAGS@
--- a/boehmgc-coroutine-sp-fallback.diff
+++ b/boehmgc-coroutine-sp-fallback.diff
@@ -1,42 +0,0 @@
-diff --git a/pthread_stop_world.c b/pthread_stop_world.c
-index 1cee6a0b..46c3acd9 100644
--- a/pthread_stop_world.c
-+++ b/pthread_stop_world.c
-@@ -674,6 +674,8 @@ GC_INNER void GC_push_all_stacks(void)
-     struct GC_traced_stack_sect_s *traced_stack_sect;
-     pthread_t self = pthread_self();
-     word total_size = 0;
-+    size_t stack_limit;
-+    pthread_attr_t pattr;
- 
-     if (!EXPECT(GC_thr_initialized, TRUE))
-       GC_thr_init();
-@@ -723,6 +725,28 @@ GC_INNER void GC_push_all_stacks(void)
-           hi = p->altstack + p->altstack_size;
-           /* FIXME: Need to scan the normal stack too, but how ? */
-           /* FIXME: Assume stack grows down */
-+        } else {
-+          if (pthread_getattr_np(p->id, &pattr)) {
-+            ABORT("GC_push_all_stacks: pthread_getattr_np failed!");
-+          }
-+          if (pthread_attr_getstacksize(&pattr, &stack_limit)) {
-+            ABORT("GC_push_all_stacks: pthread_attr_getstacksize failed!");
-+          }
-+          // When a thread goes into a coroutine, we lose its original sp until
-+          // control flow returns to the thread.
-+          // While in the coroutine, the sp points outside the thread stack,
-+          // so we can detect this and push the entire thread stack instead,
-+          // as an approximation.
-+          // We assume that the coroutine has similarly added its entire stack.
-+          // This could be made accurate by cooperating with the application
-+          // via new functions and/or callbacks.
-+          #ifndef STACK_GROWS_UP
-+            if (lo >= hi || lo < hi - stack_limit) { // sp outside stack
-+              lo = hi - stack_limit;
-+            }
-+          #else
-+          #error "STACK_GROWS_UP not supported in boost_coroutine2 (as of june 2021), so we don't support it in Nix."
-+          #endif
-         }
-         GC_push_all_stack_sections(lo, hi, traced_stack_sect);
- #       ifdef STACK_GROWS_UP
--- a/configure.ac
+++ b/configure.ac
@@ -231,7 +231,7 @@ AC_SUBST(HAVE_SECCOMP, [$have_seccomp])
 # Look for aws-cpp-sdk-s3.
 AC_LANG_PUSH(C++)
 AC_CHECK_HEADERS([aws/s3/S3Client.h],
-  [AC_DEFINE([ENABLE_S3], [1], [Whether to enable S3 support via aws-sdk-cpp.]) enable_s3=1],
+  [AC_DEFINE([ENABLE_S3], [1], [Whether to enable S3 support via aws-sdk-cpp.]) enable_s3=1], 
  [AC_DEFINE([ENABLE_S3], [0], [Whether to enable S3 support via aws-sdk-cpp.]) enable_s3=])
 AC_SUBST(ENABLE_S3, [$enable_s3])
 AC_LANG_POP(C++)
--- a/doc/manual/generate-builtins.nix
+++ b/doc/manual/generate-builtins.nix
@@ -6,11 +6,9 @@ builtins:
 concatStrings (map
  (name:
    let builtin = builtins.${name}; in
-    "<dt><code>${name} "
-    + concatStringsSep " " (map (s: "<var>${s}</var>") builtin.args)
-    + "</code></dt>"
-    + "<dd>\n\n"
-    + builtin.doc
-    + "\n\n</dd>"
+    "  - `builtins.${name}` " + concatStringsSep " " (map (s: "*${s}*") builtin.args)
+    + "  \n\n"
+    + concatStrings (map (s: "    ${s}\n") (splitLines builtin.doc)) + "\n\n"
  )
  (attrNames builtins))
+
--- a/doc/manual/local.mk
+++ b/doc/manual/local.mk
@@ -1,5 +1,7 @@
 ifeq ($(doc_generate),yes)

+MANUAL_SRCS := $(call rwildcard, $(d)/src, *.md)
+
 # Generate man pages.
 man-pages := $(foreach n, \
  nix-env.1 nix-build.1 nix-shell.1 nix-store.1 nix-instantiate.1 \
@@ -62,7 +64,6 @@ $(d)/conf-file.json: $(bindir)/nix
 $(d)/src/expressions/builtins.md: $(d)/builtins.json $(d)/generate-builtins.nix $(d)/src/expressions/builtins-prefix.md $(bindir)/nix
 	@cat doc/manual/src/expressions/builtins-prefix.md > $@.tmp
 	$(trace-gen) $(nix-eval) --expr 'import doc/manual/generate-builtins.nix (builtins.fromJSON (builtins.readFile $<))' >> $@.tmp
-	@cat doc/manual/src/expressions/builtins-suffix.md >> $@.tmp
 	@mv $@.tmp $@

 $(d)/builtins.json: $(bindir)/nix
@@ -73,26 +74,14 @@ $(d)/builtins.json: $(bindir)/nix
 install: $(docdir)/manual/index.html

 # Generate 'nix' manpages.
-install: $(mandir)/man1/nix3-manpages
-man: doc/manual/generated/man1/nix3-manpages
-all: doc/manual/generated/man1/nix3-manpages
-
-$(mandir)/man1/nix3-manpages: doc/manual/generated/man1/nix3-manpages
-	@mkdir -p $$(dirname $@)
-	$(trace-install) install -m 0644 $$(dirname $<)/* $$(dirname $@)
-
-doc/manual/generated/man1/nix3-manpages: $(d)/src/command-ref/new-cli
-	@mkdir -p $$(dirname $@)
+install: $(d)/src/command-ref/new-cli
 	$(trace-gen) for i in doc/manual/src/command-ref/new-cli/*.md; do \
 	  name=$$(basename $$i .md); \
-	  tmpFile=$$(mktemp); \
 	  if [[ $$name = SUMMARY ]]; then continue; fi; \
-	  printf "Title: %s\n\n" "$$name" > $$tmpFile; \
-	  cat $$i >> $$tmpFile; \
-	  lowdown -sT man -M section=1 $$tmpFile -o $$(dirname $@)/$$name.1; \
-	  rm $$tmpFile; \
+	  printf "Title: %s\n\n" "$$name" > $$i.tmp; \
+	  cat $$i >> $$i.tmp; \
+	  lowdown -sT man -M section=1 $$i.tmp -o $(mandir)/man1/$$name.1; \
 	done
-	touch $@

 $(docdir)/manual/index.html: $(MANUAL_SRCS) $(d)/book.toml $(d)/custom.css $(d)/src/SUMMARY.md $(d)/src/command-ref/new-cli $(d)/src/command-ref/conf-file.md $(d)/src/expressions/builtins.md
 	$(trace-gen) RUST_LOG=warn mdbook build doc/manual -d $(docdir)/manual
--- a/doc/manual/src/expressions/builtins-prefix.md
+++ b/doc/manual/src/expressions/builtins-prefix.md
@@ -9,8 +9,7 @@ scope. Instead, you can access them through the `builtins` built-in
 value, which is a set that contains all built-in functions and values.
 For instance, `derivation` is also available as `builtins.derivation`.

-<dl>
-  <dt><code>derivation <var>attrs</var></code>;
-      <code>builtins.derivation <var>attrs</var></code></dt>
-  <dd><p><var>derivation</var> in described in
-         <a href="derivations.md">its own section</a>.</p></dd>
+  - `derivation` *attrs*; `builtins.derivation` *attrs*\
+
+    `derivation` is described in [its own section](derivations.md).
+
--- a/doc/manual/src/expressions/builtins-suffix.md
+++ b/doc/manual/src/expressions/builtins-suffix.md
@@ -1 +0,0 @@
-</dl>
--- a/flake.nix
+++ b/flake.nix
@@ -20,8 +20,6 @@
      linuxSystems = linux64BitSystems ++ [ "i686-linux" ];
      systems = linuxSystems ++ [ "x86_64-darwin" "aarch64-darwin" ];

-      crossSystems = [ "armv6l-linux" "armv7l-linux" ];
-
      forAllSystems = f: nixpkgs.lib.genAttrs systems (system: f system);

      # Memoize nixpkgs for different platforms for efficiency.
@@ -81,7 +79,7 @@
            buildPackages.mercurial
            buildPackages.jq
          ]
-          ++ lib.optionals stdenv.hostPlatform.isLinux [(buildPackages.util-linuxMinimal or buildPackages.utillinuxMinimal)];
+          ++ lib.optionals stdenv.isLinux [(pkgs.util-linuxMinimal or pkgs.utillinuxMinimal)];

        buildDeps =
          [ curl
@@ -89,12 +87,13 @@
            openssl sqlite
            libarchive
            boost
+            nlohmann_json
            lowdown
            gmock
          ]
          ++ lib.optionals stdenv.isLinux [libseccomp]
          ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
-          ++ lib.optional stdenv.hostPlatform.isx86_64 libcpuid;
+          ++ lib.optional stdenv.isx86_64 libcpuid;

        awsDeps = lib.optional (stdenv.isLinux || stdenv.isDarwin)
          (aws-sdk-cpp.override {
@@ -103,13 +102,7 @@
          });

        propagatedDeps =
-          [ ((boehmgc.override {
-              enableLargeConfig = true;
-            }).overrideAttrs(o: {
-              patches = (o.patches or []) ++ [
-                ./boehmgc-coroutine-sp-fallback.diff
-              ];
-            }))
+          [ (boehmgc.override { enableLargeConfig = true; })
          ];

        perlDeps =
@@ -140,11 +133,10 @@

            substitute ${./scripts/install.in} $out/install \
              ${pkgs.lib.concatMapStrings
-                (system: let
-                    tarball = if builtins.elem system crossSystems then self.hydraJobs.binaryTarballCross.x86_64-linux.${system} else self.hydraJobs.binaryTarball.${system};
-                  in '' \
-                  --replace '@tarballHash_${system}@' $(nix --experimental-features nix-command hash-file --base16 --type sha256 ${tarball}/*.tar.xz) \
-                  --replace '@tarballPath_${system}@' $(tarballPath ${tarball}/*.tar.xz) \
+                (system:
+                  '' \
+                  --replace '@tarballHash_${system}@' $(nix --experimental-features nix-command hash-file --base16 --type sha256 ${self.hydraJobs.binaryTarball.${system}}/*.tar.xz) \
+                  --replace '@tarballPath_${system}@' $(tarballPath ${self.hydraJobs.binaryTarball.${system}}/*.tar.xz) \
                  ''
                )
                systems
@@ -182,77 +174,6 @@

      };

-      binaryTarball = buildPackages: nix: pkgs: let
-        inherit (pkgs) cacert;
-        installerClosureInfo = buildPackages.closureInfo { rootPaths = [ nix cacert ]; };
-      in
-
-      buildPackages.runCommand "nix-binary-tarball-${version}"
-        { #nativeBuildInputs = lib.optional (system != "aarch64-linux") shellcheck;
-          meta.description = "Distribution-independent Nix bootstrap binaries for ${pkgs.system}";
-        }
-        ''
-          cp ${installerClosureInfo}/registration $TMPDIR/reginfo
-          cp ${./scripts/create-darwin-volume.sh} $TMPDIR/create-darwin-volume.sh
-          substitute ${./scripts/install-nix-from-closure.sh} $TMPDIR/install \
-            --subst-var-by nix ${nix} \
-            --subst-var-by cacert ${cacert}
-
-          substitute ${./scripts/install-darwin-multi-user.sh} $TMPDIR/install-darwin-multi-user.sh \
-            --subst-var-by nix ${nix} \
-            --subst-var-by cacert ${cacert}
-          substitute ${./scripts/install-systemd-multi-user.sh} $TMPDIR/install-systemd-multi-user.sh \
-            --subst-var-by nix ${nix} \
-            --subst-var-by cacert ${cacert}
-          substitute ${./scripts/install-multi-user.sh} $TMPDIR/install-multi-user \
-            --subst-var-by nix ${nix} \
-            --subst-var-by cacert ${cacert}
-
-          if type -p shellcheck; then
-            # SC1090: Don't worry about not being able to find
-            #         $nix/etc/profile.d/nix.sh
-            shellcheck --exclude SC1090 $TMPDIR/install
-            shellcheck $TMPDIR/create-darwin-volume.sh
-            shellcheck $TMPDIR/install-darwin-multi-user.sh
-            shellcheck $TMPDIR/install-systemd-multi-user.sh
-
-            # SC1091: Don't panic about not being able to source
-            #         /etc/profile
-            # SC2002: Ignore "useless cat" "error", when loading
-            #         .reginfo, as the cat is a much cleaner
-            #         implementation, even though it is "useless"
-            # SC2116: Allow ROOT_HOME=$(echo ~root) for resolving
-            #         root's home directory
-            shellcheck --external-sources \
-              --exclude SC1091,SC2002,SC2116 $TMPDIR/install-multi-user
-          fi
-
-          chmod +x $TMPDIR/install
-          chmod +x $TMPDIR/create-darwin-volume.sh
-          chmod +x $TMPDIR/install-darwin-multi-user.sh
-          chmod +x $TMPDIR/install-systemd-multi-user.sh
-          chmod +x $TMPDIR/install-multi-user
-          dir=nix-${version}-${pkgs.system}
-          fn=$out/$dir.tar.xz
-          mkdir -p $out/nix-support
-          echo "file binary-dist $fn" >> $out/nix-support/hydra-build-products
-          tar cvfJ $fn \
-            --owner=0 --group=0 --mode=u+rw,uga+r \
-            --absolute-names \
-            --hard-dereference \
-            --transform "s,$TMPDIR/install,$dir/install," \
-            --transform "s,$TMPDIR/create-darwin-volume.sh,$dir/create-darwin-volume.sh," \
-            --transform "s,$TMPDIR/reginfo,$dir/.reginfo," \
-            --transform "s,$NIX_STORE,$dir/store,S" \
-            $TMPDIR/install \
-            $TMPDIR/create-darwin-volume.sh \
-            $TMPDIR/install-darwin-multi-user.sh \
-            $TMPDIR/install-systemd-multi-user.sh \
-            $TMPDIR/install-multi-user \
-            $TMPDIR/reginfo \
-            $(cat ${installerClosureInfo}/store-paths)
-        '';
-
    in {

      # A Nixpkgs overlay that overrides the 'nix' and
@@ -333,6 +254,7 @@
                xz
                pkgs.perl
                boost
+                nlohmann_json
              ]
              ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
              ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
@@ -363,7 +285,7 @@

          outputs = [ "out" "bin" "dev" ];

-          nativeBuildInputs = [ buildPackages.which ];
+          nativeBuildInputs = [ which ];

          configurePhase = ''
              ${if (stdenv.isDarwin && stdenv.isAarch64) then "echo \"HAVE_SANDBOX_INIT=false\" > configure.local" else ""}
@@ -382,33 +304,92 @@

        buildStatic = nixpkgs.lib.genAttrs linux64BitSystems (system: self.packages.${system}.nix-static);

-        buildCross = nixpkgs.lib.genAttrs crossSystems (crossSystem:
-          nixpkgs.lib.genAttrs ["x86_64-linux"] (system: self.packages.${system}."nix-${crossSystem}"));
-
        # Perl bindings for various platforms.
        perlBindings = nixpkgs.lib.genAttrs systems (system: self.packages.${system}.nix.perl-bindings);

        # Binary tarball for various platforms, containing a Nix store
        # with the closure of 'nix' package, and the second half of
        # the installation script.
-        binaryTarball = nixpkgs.lib.genAttrs systems (system: binaryTarball nixpkgsFor.${system} nixpkgsFor.${system}.nix nixpkgsFor.${system});
+        binaryTarball = nixpkgs.lib.genAttrs systems (system:

-        binaryTarballCross = nixpkgs.lib.genAttrs ["x86_64-linux"] (system: builtins.listToAttrs (map (crossSystem: {
-          name = crossSystem;
-          value = let
-            nixpkgsCross = import nixpkgs {
-              inherit system crossSystem;
-              overlays = [ self.overlay ];
-            };
-          in binaryTarball nixpkgsFor.${system} self.packages.${system}."nix-${crossSystem}" nixpkgsCross;
-        }) crossSystems));
+          with nixpkgsFor.${system};
+
+          let
+            installerClosureInfo = closureInfo { rootPaths = [ nix cacert ]; };
+          in
+
+          runCommand "nix-binary-tarball-${version}"
+            { #nativeBuildInputs = lib.optional (system != "aarch64-linux") shellcheck;
+              meta.description = "Distribution-independent Nix bootstrap binaries for ${system}";
+            }
+            ''
+              cp ${installerClosureInfo}/registration $TMPDIR/reginfo
+              cp ${./scripts/create-darwin-volume.sh} $TMPDIR/create-darwin-volume.sh
+              substitute ${./scripts/install-nix-from-closure.sh} $TMPDIR/install \
+                --subst-var-by nix ${nix} \
+                --subst-var-by cacert ${cacert}
+
+              substitute ${./scripts/install-darwin-multi-user.sh} $TMPDIR/install-darwin-multi-user.sh \
+                --subst-var-by nix ${nix} \
+                --subst-var-by cacert ${cacert}
+              substitute ${./scripts/install-systemd-multi-user.sh} $TMPDIR/install-systemd-multi-user.sh \
+                --subst-var-by nix ${nix} \
+                --subst-var-by cacert ${cacert}
+              substitute ${./scripts/install-multi-user.sh} $TMPDIR/install-multi-user \
+                --subst-var-by nix ${nix} \
+                --subst-var-by cacert ${cacert}
+
+              if type -p shellcheck; then
+                # SC1090: Don't worry about not being able to find
+                #         $nix/etc/profile.d/nix.sh
+                shellcheck --exclude SC1090 $TMPDIR/install
+                shellcheck $TMPDIR/create-darwin-volume.sh
+                shellcheck $TMPDIR/install-darwin-multi-user.sh
+                shellcheck $TMPDIR/install-systemd-multi-user.sh
+
+                # SC1091: Don't panic about not being able to source
+                #         /etc/profile
+                # SC2002: Ignore "useless cat" "error", when loading
+                #         .reginfo, as the cat is a much cleaner
+                #         implementation, even though it is "useless"
+                # SC2116: Allow ROOT_HOME=$(echo ~root) for resolving
+                #         root's home directory
+                shellcheck --external-sources \
+                  --exclude SC1091,SC2002,SC2116 $TMPDIR/install-multi-user
+              fi
+
+              chmod +x $TMPDIR/install
+              chmod +x $TMPDIR/create-darwin-volume.sh
+              chmod +x $TMPDIR/install-darwin-multi-user.sh
+              chmod +x $TMPDIR/install-systemd-multi-user.sh
+              chmod +x $TMPDIR/install-multi-user
+              dir=nix-${version}-${system}
+              fn=$out/$dir.tar.xz
+              mkdir -p $out/nix-support
+              echo "file binary-dist $fn" >> $out/nix-support/hydra-build-products
+              tar cvfJ $fn \
+                --owner=0 --group=0 --mode=u+rw,uga+r \
+                --absolute-names \
+                --hard-dereference \
+                --transform "s,$TMPDIR/install,$dir/install," \
+                --transform "s,$TMPDIR/create-darwin-volume.sh,$dir/create-darwin-volume.sh," \
+                --transform "s,$TMPDIR/reginfo,$dir/.reginfo," \
+                --transform "s,$NIX_STORE,$dir/store,S" \
+                $TMPDIR/install \
+                $TMPDIR/create-darwin-volume.sh \
+                $TMPDIR/install-darwin-multi-user.sh \
+                $TMPDIR/install-systemd-multi-user.sh \
+                $TMPDIR/install-multi-user \
+                $TMPDIR/reginfo \
+                $(cat ${installerClosureInfo}/store-paths)
+            '');

        # The first half of the installation script. This is uploaded
        # to https://nixos.org/nix/install. It downloads the binary
        # tarball for the user's system and calls the second half of the
        # installation script.
-        installerScript = installScriptFor [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" "armv6l-linux" "armv7l-linux" ];
-        installerScriptForGHA = installScriptFor [ "x86_64-linux" "x86_64-darwin" "armv6l-linux" "armv7l-linux"];
+        installerScript = installScriptFor [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
+        installerScriptForGHA = installScriptFor [ "x86_64-linux" "x86_64-darwin" ];

        # Line coverage analysis.
        coverage =
@@ -502,14 +483,11 @@
            # `NIX_DAEMON_SOCKET_PATH` which is required for the tests to work
            # againstLatestStable = testNixVersions pkgs pkgs.nix pkgs.nixStable;
          } "touch $out";
-      } // (if system == "x86_64-linux" then (builtins.listToAttrs (map (crossSystem: {
-        name = "binaryTarball-${crossSystem}";
-        value = self.hydraJobs.binaryTarballCross.${system}.${crossSystem};
-      }) crossSystems)) else {}));
+      });

      packages = forAllSystems (system: {
        inherit (nixpkgsFor.${system}) nix;
-      } // (nixpkgs.lib.optionalAttrs (builtins.elem system linux64BitSystems) {
+      } // nixpkgs.lib.optionalAttrs (builtins.elem system linux64BitSystems) {
        nix-static = let
          nixpkgs = nixpkgsFor.${system}.pkgsStatic;
        in with commonDeps nixpkgs; nixpkgs.stdenv.mkDerivation {
@@ -547,49 +525,8 @@
          stripAllList = ["bin"];

          strictDeps = true;
-
-          hardeningDisable = [ "pie" ];
        };
-      } // builtins.listToAttrs (map (crossSystem: {
-        name = "nix-${crossSystem}";
-        value = let
-          nixpkgsCross = import nixpkgs {
-            inherit system crossSystem;
-            overlays = [ self.overlay ];
-          };
-        in with commonDeps nixpkgsCross; nixpkgsCross.stdenv.mkDerivation {
-          name = "nix-${version}";
-
-          src = self;
-
-          VERSION_SUFFIX = versionSuffix;
-
-          outputs = [ "out" "dev" "doc" ];
-
-          nativeBuildInputs = nativeBuildDeps;
-          buildInputs = buildDeps ++ propagatedDeps;
-
-          configureFlags = [ "--sysconfdir=/etc" "--disable-doc-gen" ];
-
-          enableParallelBuilding = true;
-
-          makeFlags = "profiledir=$(out)/etc/profile.d";
-
-          doCheck = true;
-
-          installFlags = "sysconfdir=$(out)/etc";
-
-          postInstall = ''
-            mkdir -p $doc/nix-support
-            echo "doc manual $doc/share/doc/nix/manual" >> $doc/nix-support/hydra-build-products
-            mkdir -p $out/nix-support
-            echo "file binary-dist $out/bin/nix" >> $out/nix-support/hydra-build-products
-          '';
-
-          doInstallCheck = true;
-          installCheckFlags = "sysconfdir=$(out)/etc";
-        };
-      }) crossSystems)));
+      });

      defaultPackage = forAllSystems (system: self.packages.${system}.nix);

--- a/maintainers/upload-release.pl
+++ b/maintainers/upload-release.pl
@@ -110,9 +110,6 @@ downloadFile("binaryTarball.i686-linux", "1");
 downloadFile("binaryTarball.x86_64-linux", "1");
 downloadFile("binaryTarball.aarch64-linux", "1");
 downloadFile("binaryTarball.x86_64-darwin", "1");
-downloadFile("binaryTarball.aarch64-darwin", "1");
-downloadFile("binaryTarballCross.x86_64-linux.armv6l-linux", "1");
-downloadFile("binaryTarballCross.x86_64-linux.armv7l-linux", "1");
 downloadFile("installerScript", "1");

 for my $fn (glob "$tmpDir/*") {
@@ -156,7 +153,6 @@ write_file("$nixpkgsDir/nixos/modules/installer/tools/nix-fallback-paths.nix",
           "  i686-linux = \"" . getStorePath("build.i686-linux") . "\";\n" .
           "  aarch64-linux = \"" . getStorePath("build.aarch64-linux") . "\";\n" .
           "  x86_64-darwin = \"" . getStorePath("build.x86_64-darwin") . "\";\n" .
-           "  aarch64-darwin = \"" . getStorePath("build.aarch64-darwin") . "\";\n" .
           "}\n");

 system("cd $nixpkgsDir && git commit -a -m 'nix-fallback-paths.nix: Update to $version'") == 0 or die;
--- a/misc/fish/completion.fish
+++ b/misc/fish/completion.fish
@@ -1,37 +0,0 @@
-function _nix_complete
-  # Get the current command up to a cursor.
-  # - Behaves correctly even with pipes and nested in commands like env.
-  # - TODO: Returns the command verbatim (does not interpolate variables).
-  #   That might not be optimal for arguments like -f.
-  set -l nix_args (commandline --current-process --tokenize --cut-at-cursor)
-  # --cut-at-cursor with --tokenize removes the current token so we need to add it separately.
-  # https://github.com/fish-shell/fish-shell/issues/7375
-  # Can be an empty string.
-  set -l current_token (commandline --current-token --cut-at-cursor)
-
-  # Nix wants the index of the argv item to complete but the $nix_args variable
-  # also contains the program name (argv[0]) so we would need to subtract 1.
-  # But the variable also misses the current token so it cancels out.
-  set -l nix_arg_to_complete (count $nix_args)
-
-  env NIX_GET_COMPLETIONS=$nix_arg_to_complete $nix_args $current_token
-end
-
-function _nix_accepts_files
-  set -l response (_nix_complete)
-  # First line is either filenames or no-filenames.
-  test $response[1] = 'filenames'
-end
-
-function _nix
-  set -l response (_nix_complete)
-  # Skip the first line since it handled by _nix_accepts_files.
-  # Tail lines each contain a command followed by a tab character and, optionally, a description.
-  # This is also the format fish expects.
-  string collect -- $response[2..-1]
-end
-
-# Disable file path completion if paths do not belong in the current context.
-complete --command nix --condition 'not _nix_accepts_files' --no-files
-
-complete --command nix --arguments '(_nix)'
--- a/misc/fish/local.mk
+++ b/misc/fish/local.mk
@@ -1 +0,0 @@
-$(eval $(call install-file-as, $(d)/completion.fish, $(datarootdir)/fish/vendor_completions.d/nix.fish, 0644))
--- a/misc/launchd/local.mk
+++ b/misc/launchd/local.mk
@@ -1,4 +1,4 @@
-ifdef HOST_DARWIN
+ifeq ($(OS), Darwin)

  $(eval $(call install-data-in, $(d)/org.nixos.nix-daemon.plist, $(prefix)/Library/LaunchDaemons))

--- a/misc/systemd/local.mk
+++ b/misc/systemd/local.mk
@@ -1,4 +1,4 @@
-ifdef HOST_LINUX
+ifeq ($(OS), Linux)

  $(foreach n, nix-daemon.socket nix-daemon.service, $(eval $(call install-file-in, $(d)/$(n), $(prefix)/lib/systemd/system, 0644)))

--- a/misc/upstart/local.mk
+++ b/misc/upstart/local.mk
@@ -1,4 +1,4 @@
-ifdef HOST_LINUX
+ifeq ($(OS), Linux)

  $(foreach n, nix-daemon.conf, $(eval $(call install-file-in, $(d)/$(n), $(sysconfdir)/init, 0644)))

--- a/mk/lib.mk
+++ b/mk/lib.mk
@@ -10,25 +10,8 @@ bin-scripts :=
 noinst-scripts :=
 man-pages :=
 install-tests :=
+OS = $(shell uname -s)

-ifdef HOST_OS
-  HOST_KERNEL = $(firstword $(subst -, ,$(HOST_OS)))
-  ifeq ($(HOST_KERNEL), cygwin)
-    HOST_CYGWIN = 1
-  endif
-  ifeq ($(patsubst darwin%,,$(HOST_KERNEL)),)
-    HOST_DARWIN = 1
-  endif
-  ifeq ($(patsubst freebsd%,,$(HOST_KERNEL)),)
-    HOST_FREEBSD = 1
-  endif
-  ifeq ($(HOST_KERNEL), linux)
-    HOST_LINUX = 1
-  endif
-  ifeq ($(patsubst solaris%,,$(HOST_KERNEL)),)
-    HOST_SOLARIS = 1
-  endif
-endif

 # Hack to define a literal space.
 space :=
@@ -67,16 +50,16 @@ endif
 BUILD_SHARED_LIBS ?= 1

 ifeq ($(BUILD_SHARED_LIBS), 1)
-  ifdef HOST_CYGWIN
+  ifeq (CYGWIN,$(findstring CYGWIN,$(OS)))
    GLOBAL_CFLAGS += -U__STRICT_ANSI__ -D_GNU_SOURCE
    GLOBAL_CXXFLAGS += -U__STRICT_ANSI__ -D_GNU_SOURCE
  else
    GLOBAL_CFLAGS += -fPIC
    GLOBAL_CXXFLAGS += -fPIC
  endif
-  ifndef HOST_DARWIN
-   ifndef HOST_SOLARIS
-    ifndef HOST_FREEBSD
+  ifneq ($(OS), Darwin)
+   ifneq ($(OS), SunOS)
+    ifneq ($(OS), FreeBSD)
     GLOBAL_LDFLAGS += -Wl,--no-copy-dt-needed-entries
    endif
   endif
--- a/mk/libraries.mk
+++ b/mk/libraries.mk
@@ -1,9 +1,9 @@
 libs-list :=

-ifdef HOST_DARWIN
+ifeq ($(OS), Darwin)
  SO_EXT = dylib
 else
-  ifdef HOST_CYGWIN
+  ifeq (CYGWIN,$(findstring CYGWIN,$(OS)))
    SO_EXT = dll
  else
    SO_EXT = so
@@ -59,7 +59,7 @@ define build-library
  $(1)_OBJS := $$(addprefix $(buildprefix), $$(addsuffix .o, $$(basename $$(_srcs))))
  _libs := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_PATH))

-  ifdef HOST_CYGWIN
+  ifeq (CYGWIN,$(findstring CYGWIN,$(OS)))
    $(1)_INSTALL_DIR ?= $$(bindir)
  else
    $(1)_INSTALL_DIR ?= $$(libdir)
@@ -73,18 +73,18 @@ define build-library
  ifeq ($(BUILD_SHARED_LIBS), 1)

    ifdef $(1)_ALLOW_UNDEFINED
-      ifdef HOST_DARWIN
+      ifeq ($(OS), Darwin)
        $(1)_LDFLAGS += -undefined suppress -flat_namespace
      endif
    else
-      ifndef HOST_DARWIN
-        ifndef HOST_CYGWIN
+      ifneq ($(OS), Darwin)
+        ifneq (CYGWIN,$(findstring CYGWIN,$(OS)))
          $(1)_LDFLAGS += -Wl,-z,defs
        endif
      endif
    endif

-    ifndef HOST_DARWIN
+    ifneq ($(OS), Darwin)
      $(1)_LDFLAGS += -Wl,-soname=$$($(1)_NAME).$(SO_EXT)
    endif

@@ -93,7 +93,7 @@ define build-library
    $$($(1)_PATH): $$($(1)_OBJS) $$(_libs) | $$(_d)/
 	$$(trace-ld) $(CXX) -o $$(abspath $$@) -shared $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) $$($(1)_LDFLAGS_UNINSTALLED)

-    ifndef HOST_DARWIN
+    ifneq ($(OS), Darwin)
      $(1)_LDFLAGS_USE += -Wl,-rpath,$$(abspath $$(_d))
    endif
    $(1)_LDFLAGS_USE += -L$$(_d) -l$$(patsubst lib%,%,$$(strip $$($(1)_NAME)))
@@ -108,7 +108,7 @@ define build-library
 	$$(trace-ld) $(CXX) -o $$@ -shared $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED))

    $(1)_LDFLAGS_USE_INSTALLED += -L$$(DESTDIR)$$($(1)_INSTALL_DIR) -l$$(patsubst lib%,%,$$(strip $$($(1)_NAME)))
-    ifndef HOST_DARWIN
+    ifneq ($(OS), Darwin)
      ifeq ($(SET_RPATH_TO_LIBS), 1)
        $(1)_LDFLAGS_USE_INSTALLED += -Wl,-rpath,$$($(1)_INSTALL_DIR)
      else
--- a/nix-rust/local.mk
+++ b/nix-rust/local.mk
@@ -11,12 +11,12 @@ libnixrust_INSTALL_PATH := $(libdir)/libnixrust.$(SO_EXT)
 libnixrust_LDFLAGS_USE := -L$(d)/target/$(RUST_DIR) -lnixrust
 libnixrust_LDFLAGS_USE_INSTALLED := -L$(libdir) -lnixrust

-ifdef HOST_LINUX
+ifeq ($(OS), Linux)
 libnixrust_LDFLAGS_USE += -ldl
 libnixrust_LDFLAGS_USE_INSTALLED += -ldl
 endif

-ifdef HOST_DARWIN
+ifeq ($(OS), Darwin)
 libnixrust_BUILD_FLAGS = NIX_LDFLAGS="-undefined dynamic_lookup"
 else
 libnixrust_LDFLAGS_USE += -Wl,-rpath,$(abspath $(d)/target/$(RUST_DIR))
@@ -31,7 +31,7 @@ $(libnixrust_PATH): $(call rwildcard, $(d)/src, *.rs) $(d)/Cargo.toml

 $(libnixrust_INSTALL_PATH): $(libnixrust_PATH)
 	$(target-gen) cp $^ $@
-ifdef HOST_DARWIN
+ifeq ($(OS), Darwin)
 	install_name_tool -id $@ $@
 endif

@@ -40,7 +40,7 @@ clean: clean-rust
 clean-rust:
 	$(suppress) rm -rfv nix-rust/target

-ifndef HOST_DARWIN
+ifneq ($(OS), Darwin)
 check: rust-tests

 rust-tests:
--- a/perl/Makefile
+++ b/perl/Makefile
@@ -1,6 +1,6 @@
 makefiles = local.mk

-GLOBAL_CXXFLAGS += -g -Wall -std=c++17 -I ../src
+GLOBAL_CXXFLAGS += -g -Wall -std=c++17

 -include Makefile.config

--- a/perl/Makefile.config.in
+++ b/perl/Makefile.config.in
@@ -1,4 +1,3 @@
-HOST_OS = @host_os@
 CC = @CC@
 CFLAGS = @CFLAGS@
 CXX = @CXX@
--- a/perl/configure.ac
+++ b/perl/configure.ac
@@ -7,8 +7,6 @@ CXXFLAGS=
 AC_PROG_CC
 AC_PROG_CXX

-AC_CANONICAL_HOST
-
 # Use 64-bit file system calls so that we can support files > 2 GiB.
 AC_SYS_LARGEFILE

--- a/perl/local.mk
+++ b/perl/local.mk
@@ -28,7 +28,7 @@ Store_CXXFLAGS = \

 Store_LDFLAGS := $(SODIUM_LIBS) $(NIX_LIBS)

-ifdef HOST_CYGWIN
+ifeq (CYGWIN,$(findstring CYGWIN,$(OS)))
  archlib = $(shell perl -E 'use Config; print $$Config{archlib};')
  libperl = $(shell perl -E 'use Config; print $$Config{libperl};')
  Store_LDFLAGS += $(shell find ${archlib} -name ${libperl})
--- a/scripts/install-nix-from-closure.sh
+++ b/scripts/install-nix-from-closure.sh
@@ -106,11 +106,12 @@ while [ $# -gt 0 ]; do
                echo ""
                echo " --no-channel-add:    Don't add any channels. nixpkgs-unstable is installed by default."
                echo ""
-                echo " --no-modify-profile: Don't modify the user profile to automatically load nix."
+                echo " --no-modify-profile: Skip channel installation. When not provided nixpkgs-unstable"
+                echo "                      is installed by default."
                echo ""
                echo " --daemon-user-count: Number of build users to create. Defaults to 32."
                echo ""
-                echo " --nix-extra-conf-file: Path to nix.conf to prepend when installing /etc/nix/nix.conf"
+                echo " --nix-extra-conf-file: Path to nix.conf to prepend when installing /etc/nix.conf"
                echo ""
                if [ -n "${INVOKED_FROM_INSTALL_IN:-}" ]; then
                    echo " --tarball-url-prefix URL: Base URL to download the Nix tarball from."
--- a/scripts/install.in
+++ b/scripts/install.in
@@ -40,23 +40,13 @@ case "$(uname -s).$(uname -m)" in
        path=@tarballPath_aarch64-linux@
        system=aarch64-linux
        ;;
-    Linux.armv6l_linux)
-        hash=@tarballHash_armv6l-linux@
-        path=@tarballPath_armv6l-linux@
-        system=armv6l-linux
-        ;;
-    Linux.armv7l_linux)
-        hash=@tarballHash_armv7l-linux@
-        path=@tarballPath_armv7l-linux@
-        system=armv7l-linux
-        ;;
    Darwin.x86_64)
        hash=@tarballHash_x86_64-darwin@
        path=@tarballPath_x86_64-darwin@
        system=x86_64-darwin
        ;;
    Darwin.arm64|Darwin.aarch64)
-        hash=@tarballHash_aarch64-darwin@
+        hash=@binaryTarball_aarch64-darwin@
        path=@tarballPath_aarch64-darwin@
        system=aarch64-darwin
        ;;
--- a/src/libcmd/command.cc
+++ b/src/libcmd/command.cc
@@ -188,7 +188,7 @@ void MixProfile::updateProfile(const BuiltPaths & buildables)
    }

    if (result.size() != 1)
-        throw UsageError("'--profile' requires that the arguments produce a single store path, but there are %d", result.size());
+        throw Error("'--profile' requires that the arguments produce a single store path, but there are %d", result.size());

    updateProfile(result[0]);
 }
--- a/src/libcmd/installables.cc
+++ b/src/libcmd/installables.cc
@@ -58,13 +58,9 @@ MixFlakeOptions::MixFlakeOptions()

    addFlag({
        .longName = "no-registries",
-        .description =
-          "Don't allow lookups in the flake registries. This option is deprecated; use `--no-use-registries`.",
+        .description = "Don't allow lookups in the flake registries.",
        .category = category,
-        .handler = {[&]() {
-            lockFlags.useRegistries = false;
-            warn("'--no-registries' is deprecated; use '--no-use-registries'");
-        }}
+        .handler = {&lockFlags.useRegistries, false}
    });

    addFlag({
@@ -175,50 +171,14 @@ Strings SourceExprCommand::getDefaultFlakeAttrPathPrefixes()

 void SourceExprCommand::completeInstallable(std::string_view prefix)
 {
-    if (file) {
-        evalSettings.pureEval = false;
-        auto state = getEvalState();
-        Expr *e = state->parseExprFromFile(
-            resolveExprPath(state->checkSourcePath(lookupFileArg(*state, *file)))
-        );
+    if (file) return; // FIXME

-        Value root;
-        state->eval(e, root);
-
-        auto autoArgs = getAutoArgs(*state);
-
-        std::string prefix_ = std::string(prefix);
-        auto sep = prefix_.rfind('.');
-        std::string searchWord;
-        if (sep != std::string::npos) {
-            searchWord = prefix_.substr(sep, std::string::npos);
-            prefix_ = prefix_.substr(0, sep);
-        } else {
-            searchWord = prefix_;
-            prefix_ = "";
-        }
-
-        Value &v1(*findAlongAttrPath(*state, prefix_, *autoArgs, root).first);
-        state->forceValue(v1);
-        Value v2;
-        state->autoCallFunction(*autoArgs, v1, v2);
-
-        if (v2.type() == nAttrs) {
-            for (auto & i : *v2.attrs) {
-                std::string name = i.name;
-                if (name.find(searchWord) == 0) {
-                    completions->add(i.name);
-                }
-            }
-        }
-    } else {
-        completeFlakeRefWithFragment(
-            getEvalState(),
-            lockFlags,
-            getDefaultFlakeAttrPathPrefixes(),
-            getDefaultFlakeAttrPaths(),
-            prefix);
-    }
+    completeFlakeRefWithFragment(
+        getEvalState(),
+        lockFlags,
+        getDefaultFlakeAttrPathPrefixes(),
+        getDefaultFlakeAttrPaths(),
+        prefix);
 }

 void completeFlakeRefWithFragment(
@@ -613,10 +573,10 @@ InstallableFlake::getCursors(EvalState & state)

 std::shared_ptr<flake::LockedFlake> InstallableFlake::getLockedFlake() const
 {
-    flake::LockFlags lockFlagsApplyConfig = lockFlags;
-    lockFlagsApplyConfig.applyNixConfig = true;
    if (!_lockedFlake) {
-        _lockedFlake = std::make_shared<flake::LockedFlake>(lockFlake(*state, flakeRef, lockFlagsApplyConfig));
+        _lockedFlake = std::make_shared<flake::LockedFlake>(lockFlake(*state, flakeRef, lockFlags));
+        _lockedFlake->flake.config.apply();
+        // FIXME: send new config to the daemon.
    }
    return _lockedFlake;
 }
--- a/src/libexpr/attr-path.cc
+++ b/src/libexpr/attr-path.cc
@@ -19,7 +19,7 @@ static Strings parseAttrPath(std::string_view s)
            ++i;
            while (1) {
                if (i == s.end())
-                    throw ParseError("missing closing quote in selection path '%1%'", s);
+                    throw Error("missing closing quote in selection path '%1%'", s);
                if (*i == '"') break;
                cur.push_back(*i++);
            }
@@ -100,7 +100,7 @@ std::pair<Value *, Pos> findAlongAttrPath(EvalState & state, const string & attr
 }


-Pos findPackageFilename(EvalState & state, Value & v, std::string what)
+Pos findDerivationFilename(EvalState & state, Value & v, std::string what)
 {
    Value * v2;
    try {
@@ -116,14 +116,14 @@ Pos findPackageFilename(EvalState & state, Value & v, std::string what)

    auto colon = pos.rfind(':');
    if (colon == std::string::npos)
-        throw ParseError("cannot parse meta.position attribute '%s'", pos);
+        throw Error("cannot parse meta.position attribute '%s'", pos);

    std::string filename(pos, 0, colon);
    unsigned int lineno;
    try {
        lineno = std::stoi(std::string(pos, colon + 1));
    } catch (std::invalid_argument & e) {
-        throw ParseError("cannot parse line number '%s'", pos);
+        throw Error("cannot parse line number '%s'", pos);
    }

    Symbol file = state.symbols.create(filename);
--- a/src/libexpr/attr-path.hh
+++ b/src/libexpr/attr-path.hh
@@ -14,7 +14,7 @@ std::pair<Value *, Pos> findAlongAttrPath(EvalState & state, const string & attr
    Bindings & autoArgs, Value & vIn);

 /* Heuristic to find the filename and lineno or a nix value. */
-Pos findPackageFilename(EvalState & state, Value & v, std::string what);
+Pos findDerivationFilename(EvalState & state, Value & v, std::string what);

 std::vector<Symbol> parseAttrPath(EvalState & state, std::string_view s);

--- a/src/libexpr/eval.cc
+++ b/src/libexpr/eval.cc
@@ -64,11 +64,7 @@ static char * dupStringWithLen(const char * s, size_t size)

 RootValue allocRootValue(Value * v)
 {
-#if HAVE_BOEHMGC
    return std::allocate_shared<Value *>(traceable_allocator<Value *>(), v);
-#else
-    return std::make_shared<Value *>(v);
-#endif
 }


@@ -237,34 +233,22 @@ static void * oomHandler(size_t requested)
 }

 class BoehmGCStackAllocator : public StackAllocator {
-    boost::coroutines2::protected_fixedsize_stack stack {
-        // We allocate 8 MB, the default max stack size on NixOS.
-        // A smaller stack might be quicker to allocate but reduces the stack
-        // depth available for source filter expressions etc.
-        std::max(boost::context::stack_traits::default_size(), static_cast<std::size_t>(8 * 1024 * 1024))
+  boost::coroutines2::protected_fixedsize_stack stack {
+    // We allocate 8 MB, the default max stack size on NixOS.
+    // A smaller stack might be quicker to allocate but reduces the stack
+    // depth available for source filter expressions etc.
+    std::max(boost::context::stack_traits::default_size(), static_cast<std::size_t>(8 * 1024 * 1024))
    };

-    // This is specific to boost::coroutines2::protected_fixedsize_stack.
-    // The stack protection page is included in sctx.size, so we have to
-    // subtract one page size from the stack size.
-    std::size_t pfss_usable_stack_size(boost::context::stack_context &sctx) {
-        return sctx.size - boost::context::stack_traits::page_size();
-    }
-
  public:
    boost::context::stack_context allocate() override {
        auto sctx = stack.allocate();
-
-        // Stacks generally start at a high address and grow to lower addresses.
-        // Architectures that do the opposite are rare; in fact so rare that
-        // boost_routine does not implement it.
-        // So we subtract the stack size.
-        GC_add_roots(static_cast<char *>(sctx.sp) - pfss_usable_stack_size(sctx), sctx.sp);
+        GC_add_roots(static_cast<char *>(sctx.sp) - sctx.size, sctx.sp);
        return sctx;
    }

    void deallocate(boost::context::stack_context sctx) override {
-        GC_remove_roots(static_cast<char *>(sctx.sp) - pfss_usable_stack_size(sctx), sctx.sp);
+        GC_remove_roots(static_cast<char *>(sctx.sp) - sctx.size, sctx.sp);
        stack.deallocate(sctx);
    }

@@ -776,10 +760,18 @@ inline Value * EvalState::lookupVar(Env * env, const ExprVar & var, bool noEval)
 }


+std::atomic<uint64_t> nrValuesFreed{0};
+
+void finalizeValue(void * obj, void * data)
+{
+    nrValuesFreed++;
+}
+
 Value * EvalState::allocValue()
 {
    nrValues++;
    auto v = (Value *) allocBytes(sizeof(Value));
+    //GC_register_finalizer_no_order(v, finalizeValue, nullptr, nullptr, nullptr);
    return v;
 }

@@ -846,37 +838,39 @@ Value * Expr::maybeThunk(EvalState & state, Env & env)
 }


+unsigned long nrAvoided = 0;
+
 Value * ExprVar::maybeThunk(EvalState & state, Env & env)
 {
    Value * v = state.lookupVar(&env, *this, true);
    /* The value might not be initialised in the environment yet.
       In that case, ignore it. */
-    if (v) { state.nrAvoided++; return v; }
+    if (v) { nrAvoided++; return v; }
    return Expr::maybeThunk(state, env);
 }


 Value * ExprString::maybeThunk(EvalState & state, Env & env)
 {
-    state.nrAvoided++;
+    nrAvoided++;
    return &v;
 }

 Value * ExprInt::maybeThunk(EvalState & state, Env & env)
 {
-    state.nrAvoided++;
+    nrAvoided++;
    return &v;
 }

 Value * ExprFloat::maybeThunk(EvalState & state, Env & env)
 {
-    state.nrAvoided++;
+    nrAvoided++;
    return &v;
 }

 Value * ExprPath::maybeThunk(EvalState & state, Env & env)
 {
-    state.nrAvoided++;
+    nrAvoided++;
    return &v;
 }

@@ -914,7 +908,7 @@ void EvalState::evalFile(const Path & path_, Value & v, bool mustBeTrivial)
        // computation.
        if (mustBeTrivial &&
            !(dynamic_cast<ExprAttrs *>(e)))
-            throw EvalError("file '%s' must be an attribute set", path);
+            throw Error("file '%s' must be an attribute set", path);
        eval(e, v);
    } catch (Error & e) {
        addErrorTrace(e, "while evaluating the file '%1%':", path2);
@@ -1131,6 +1125,8 @@ static string showAttrPath(EvalState & state, Env & env, const AttrPath & attrPa
 }


+unsigned long nrLookups = 0;
+
 void ExprSelect::eval(EvalState & state, Env & env, Value & v)
 {
    Value vTmp;
@@ -1142,7 +1138,7 @@ void ExprSelect::eval(EvalState & state, Env & env, Value & v)
    try {

        for (auto & i : attrPath) {
-            state.nrLookups++;
+            nrLookups++;
            Bindings::iterator j;
            Symbol name = getName(i, state, env);
            if (def) {
--- a/src/libexpr/eval.hh
+++ b/src/libexpr/eval.hh
@@ -316,10 +316,8 @@ private:
    unsigned long nrValuesInEnvs = 0;
    unsigned long nrValues = 0;
    unsigned long nrListElems = 0;
-    unsigned long nrLookups = 0;
    unsigned long nrAttrsets = 0;
    unsigned long nrAttrsInAttrsets = 0;
-    unsigned long nrAvoided = 0;
    unsigned long nrOpUpdates = 0;
    unsigned long nrOpUpdateValuesCopied = 0;
    unsigned long nrListConcats = 0;
@@ -341,11 +339,6 @@ private:

    friend struct ExprOpUpdate;
    friend struct ExprOpConcatLists;
-    friend struct ExprVar;
-    friend struct ExprString;
-    friend struct ExprInt;
-    friend struct ExprFloat;
-    friend struct ExprPath;
    friend struct ExprSelect;
    friend void prim_getAttr(EvalState & state, const Pos & pos, Value * * args, Value & v);
    friend void prim_match(EvalState & state, const Pos & pos, Value * * args, Value & v);
--- a/src/libexpr/flake/flake.cc
+++ b/src/libexpr/flake/flake.cc
@@ -1,5 +1,4 @@
 #include "flake.hh"
-#include "eval.hh"
 #include "lockfile.hh"
 #include "primops.hh"
 #include "eval-inline.hh"
@@ -297,14 +296,7 @@ LockedFlake lockFlake(

    FlakeCache flakeCache;

-    auto useRegistries = lockFlags.useRegistries.value_or(settings.useRegistries);
-
-    auto flake = getFlake(state, topRef, useRegistries, flakeCache);
-
-    if (lockFlags.applyNixConfig) {
-        flake.config.apply();
-        // FIXME: send new config to the daemon.
-    }
+    auto flake = getFlake(state, topRef, lockFlags.useRegistries, flakeCache);

    try {

@@ -367,12 +359,7 @@ LockedFlake lockFlake(
                       ancestors? */
                    auto i = overrides.find(inputPath);
                    bool hasOverride = i != overrides.end();
-                    if (hasOverride) {
-                        overridesUsed.insert(inputPath);
-                        // Respect the “flakeness” of the input even if we
-                        // override it
-                        i->second.isFlake = input2.isFlake;
-                    }
+                    if (hasOverride) overridesUsed.insert(inputPath);
                    auto & input = hasOverride ? i->second : input2;

                    /* Resolve 'follows' later (since it may refer to an input
@@ -467,7 +454,7 @@ LockedFlake lockFlake(
                            throw Error("cannot update flake input '%s' in pure mode", inputPathS);

                        if (input.isFlake) {
-                            auto inputFlake = getFlake(state, *input.ref, useRegistries, flakeCache);
+                            auto inputFlake = getFlake(state, *input.ref, lockFlags.useRegistries, flakeCache);

                            /* Note: in case of an --override-input, we use
                               the *original* ref (input2.ref) for the
@@ -502,7 +489,7 @@ LockedFlake lockFlake(

                        else {
                            auto [sourceInfo, resolvedRef, lockedRef] = fetchOrSubstituteTree(
-                                state, *input.ref, useRegistries, flakeCache);
+                                state, *input.ref, lockFlags.useRegistries, flakeCache);
                            node->inputs.insert_or_assign(id,
                                std::make_shared<LockedNode>(lockedRef, *input.ref, false));
                        }
@@ -576,7 +563,7 @@ LockedFlake lockFlake(
                           also just clear the 'rev' field... */
                        auto prevLockedRef = flake.lockedRef;
                        FlakeCache dummyCache;
-                        flake = getFlake(state, topRef, useRegistries, dummyCache);
+                        flake = getFlake(state, topRef, lockFlags.useRegistries, dummyCache);

                        if (lockFlags.commitLockFile &&
                            flake.lockedRef.input.getRev() &&
@@ -646,7 +633,7 @@ static void prim_getFlake(EvalState & state, const Pos & pos, Value * * args, Va
        lockFlake(state, flakeRef,
            LockFlags {
                .updateLockFile = false,
-                .useRegistries = !evalSettings.pureEval && !settings.useRegistries,
+                .useRegistries = !evalSettings.pureEval,
                .allowMutable  = !evalSettings.pureEval,
            }),
        v);
--- a/src/libexpr/flake/flake.hh
+++ b/src/libexpr/flake/flake.hh
@@ -102,11 +102,7 @@ struct LockFlags

    /* Whether to use the registries to lookup indirect flake
       references like 'nixpkgs'. */
-    std::optional<bool> useRegistries = std::nullopt;
-
-    /* Whether to apply flake's nixConfig attribute to the configuration */
-
-    bool applyNixConfig = false;
+    bool useRegistries = true;

    /* Whether mutable flake references (i.e. those without a Git
       revision or similar) without a corresponding lock are
--- a/src/libexpr/lexer.l
+++ b/src/libexpr/lexer.l
@@ -38,13 +38,11 @@ static void adjustLoc(YYLTYPE * loc, const char * s, size_t len)
    loc->first_line = loc->last_line;
    loc->first_column = loc->last_column;

-    for (size_t i = 0; i < len; i++) {
+    while (len--) {
       switch (*s++) {
       case '\r':
-           if (*s == '\n') { /* cr/lf */
-               i++;
+           if (*s == '\n') /* cr/lf */
               s++;
-           }
           /* fall through */
       case '\n':
           ++loc->last_line;
--- a/src/libexpr/local.mk
+++ b/src/libexpr/local.mk
@@ -16,7 +16,7 @@ libexpr_CXXFLAGS += -I src/libutil -I src/libstore -I src/libfetchers -I src/lib
 libexpr_LIBS = libutil libstore libfetchers

 libexpr_LDFLAGS = -lboost_context
-ifdef HOST_LINUX
+ifeq ($(OS), Linux)
 libexpr_LDFLAGS += -ldl
 endif

--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -3109,7 +3109,7 @@ static RegisterPrimOp primop_toString({

        - A path (e.g., `toString /foo/bar` yields `"/foo/bar"`.

-        - A set containing `{ __toString = self: ...; }` or `{ outPath = ...; }`.
+        - A set containing `{ __toString = self: ...; }`.

        - An integer.

--- a/src/libexpr/primops/fetchMercurial.cc
+++ b/src/libexpr/primops/fetchMercurial.cc
@@ -62,7 +62,6 @@ static void prim_fetchMercurial(EvalState & state, const Pos & pos, Value * * ar
    fetchers::Attrs attrs;
    attrs.insert_or_assign("type", "hg");
    attrs.insert_or_assign("url", url.find("://") != std::string::npos ? url : "file://" + url);
-    attrs.insert_or_assign("name", name);
    if (ref) attrs.insert_or_assign("ref", *ref);
    if (rev) attrs.insert_or_assign("rev", rev->gitRev());
    auto input = fetchers::Input::fromAttrs(std::move(attrs));
--- a/src/libexpr/primops/fetchTree.cc
+++ b/src/libexpr/primops/fetchTree.cc
@@ -7,7 +7,6 @@

 #include <ctime>
 #include <iomanip>
-#include <regex>

 namespace nix {

@@ -61,19 +60,10 @@ void emitTreeAttrs(
    v.attrs->sort();
 }

-std::string fixURI(std::string uri, EvalState &state, const std::string & defaultScheme = "file")
+std::string fixURI(std::string uri, EvalState &state)
 {
    state.checkURI(uri);
-    return uri.find("://") != std::string::npos ? uri : defaultScheme + "://" + uri;
-}
-
-std::string fixURIForGit(std::string uri, EvalState & state)
-{
-    static std::regex scp_uri("([^/].*)@(.*):(.*)");
-    if (uri[0] != '/' && std::regex_match(uri, scp_uri))
-        return fixURI(std::regex_replace(uri, scp_uri, "$1@$2/$3"), state, "ssh");
-    else
-        return fixURI(uri, state);
+    return uri.find("://") != std::string::npos ? uri : "file://" + uri;
 }

 void addURI(EvalState &state, fetchers::Attrs &attrs, Symbol name, std::string v)
@@ -82,18 +72,13 @@ void addURI(EvalState &state, fetchers::Attrs &attrs, Symbol name, std::string v
    attrs.emplace(name, n == "url" ? fixURI(v, state) : v);
 }

-struct FetchTreeParams {
-    bool emptyRevFallback = false;
-    bool allowNameArgument = false;
-};
-
 static void fetchTree(
    EvalState &state,
    const Pos &pos,
    Value **args,
    Value &v,
    const std::optional<std::string> type,
-    const FetchTreeParams & params = FetchTreeParams{}
+    bool emptyRevFallback = false
 ) {
    fetchers::Input input;
    PathSet context;
@@ -134,25 +119,17 @@ static void fetchTree(
                .errPos = pos
            });

-        if (!params.allowNameArgument)
-            if (auto nameIter = attrs.find("name"); nameIter != attrs.end())
-                throw Error({
-                    .msg = hintfmt("attribute 'name' isn’t supported in call to 'fetchTree'"),
-                    .errPos = pos
-                });
-
-
        input = fetchers::Input::fromAttrs(std::move(attrs));
    } else {
-        auto url = state.coerceToString(pos, *args[0], context, false, false);
+        auto url = fixURI(state.coerceToString(pos, *args[0], context, false, false), state);

        if (type == "git") {
            fetchers::Attrs attrs;
            attrs.emplace("type", "git");
-            attrs.emplace("url", fixURIForGit(url, state));
+            attrs.emplace("url", url);
            input = fetchers::Input::fromAttrs(std::move(attrs));
        } else {
-            input = fetchers::Input::fromURL(fixURI(url, state));
+            input = fetchers::Input::fromURL(url);
        }
    }

@@ -167,13 +144,13 @@ static void fetchTree(
    if (state.allowedPaths)
        state.allowedPaths->insert(tree.actualPath);

-    emitTreeAttrs(state, tree, input2, v, params.emptyRevFallback);
+    emitTreeAttrs(state, tree, input2, v, emptyRevFallback);
 }

 static void prim_fetchTree(EvalState & state, const Pos & pos, Value * * args, Value & v)
 {
    settings.requireExperimentalFeature("flakes");
-    fetchTree(state, pos, args, v, std::nullopt, FetchTreeParams { .allowNameArgument = false });
+    fetchTree(state, pos, args, v, std::nullopt);
 }

 // FIXME: document
@@ -315,7 +292,7 @@ static RegisterPrimOp primop_fetchTarball({

 static void prim_fetchGit(EvalState &state, const Pos &pos, Value **args, Value &v)
 {
-    fetchTree(state, pos, args, v, "git", FetchTreeParams { .emptyRevFallback = true, .allowNameArgument = true });
+    fetchTree(state, pos, args, v, "git", true);
 }

 static RegisterPrimOp primop_fetchGit({
--- a/src/libfetchers/fetchers.cc
+++ b/src/libfetchers/fetchers.cc
@@ -200,17 +200,12 @@ void Input::markChangedFile(
    return scheme->markChangedFile(*this, file, commitMsg);
 }

-std::string Input::getName() const
-{
-    return maybeGetStrAttr(attrs, "name").value_or("source");
-}
-
 StorePath Input::computeStorePath(Store & store) const
 {
    auto narHash = getNarHash();
    if (!narHash)
        throw Error("cannot compute store path for mutable input '%s'", to_string());
-    return store.makeFixedOutputPath(FileIngestionMethod::Recursive, *narHash, getName());
+    return store.makeFixedOutputPath(FileIngestionMethod::Recursive, *narHash, "source");
 }

 std::string Input::getType() const
--- a/src/libfetchers/fetchers.hh
+++ b/src/libfetchers/fetchers.hh
@@ -81,8 +81,6 @@ public:
        std::string_view file,
        std::optional<std::string> commitMsg) const;

-    std::string getName() const;
-
    StorePath computeStorePath(Store & store) const;

    // Convenience functions for common attributes.
--- a/src/libfetchers/git.cc
+++ b/src/libfetchers/git.cc
@@ -60,7 +60,7 @@ struct GitInputScheme : InputScheme
        if (maybeGetStrAttr(attrs, "type") != "git") return {};

        for (auto & [name, value] : attrs)
-            if (name != "type" && name != "url" && name != "ref" && name != "rev" && name != "shallow" && name != "submodules" && name != "lastModified" && name != "revCount" && name != "narHash" && name != "allRefs" && name != "name")
+            if (name != "type" && name != "url" && name != "ref" && name != "rev" && name != "shallow" && name != "submodules" && name != "lastModified" && name != "revCount" && name != "narHash" && name != "allRefs")
                throw Error("unsupported Git input attribute '%s'", name);

        parseURL(getStrAttr(attrs, "url"));
@@ -167,9 +167,9 @@ struct GitInputScheme : InputScheme

    std::pair<Tree, Input> fetch(ref<Store> store, const Input & _input) override
    {
-        Input input(_input);
+        auto name = "source";

-        std::string name = input.getName();
+        Input input(_input);

        bool shallow = maybeGetBoolAttr(input.attrs, "shallow").value_or(false);
        bool submodules = maybeGetBoolAttr(input.attrs, "submodules").value_or(false);
@@ -270,7 +270,7 @@ struct GitInputScheme : InputScheme
                    return files.count(file);
                };

-                auto storePath = store->addToStore(input.getName(), actualUrl, FileIngestionMethod::Recursive, htSHA256, filter);
+                auto storePath = store->addToStore("source", actualUrl, FileIngestionMethod::Recursive, htSHA256, filter);

                // FIXME: maybe we should use the timestamp of the last
                // modified dirty file?
--- a/src/libfetchers/github.cc
+++ b/src/libfetchers/github.cc
@@ -207,7 +207,7 @@ struct GitArchiveInputScheme : InputScheme

        auto url = getDownloadUrl(input);

-        auto [tree, lastModified] = downloadTarball(store, url.url, input.getName(), true, url.headers);
+        auto [tree, lastModified] = downloadTarball(store, url.url, "source", true, url.headers);

        input.attrs.insert_or_assign("lastModified", uint64_t(lastModified));

--- a/src/libfetchers/mercurial.cc
+++ b/src/libfetchers/mercurial.cc
@@ -74,7 +74,7 @@ struct MercurialInputScheme : InputScheme
        if (maybeGetStrAttr(attrs, "type") != "hg") return {};

        for (auto & [name, value] : attrs)
-            if (name != "type" && name != "url" && name != "ref" && name != "rev" && name != "revCount" && name != "narHash" && name != "name")
+            if (name != "type" && name != "url" && name != "ref" && name != "rev" && name != "revCount" && name != "narHash")
                throw Error("unsupported Mercurial input attribute '%s'", name);

        parseURL(getStrAttr(attrs, "url"));
@@ -147,9 +147,9 @@ struct MercurialInputScheme : InputScheme

    std::pair<Tree, Input> fetch(ref<Store> store, const Input & _input) override
    {
-        Input input(_input);
+        auto name = "source";

-        auto name = input.getName();
+        Input input(_input);

        auto [isLocal, actualUrl_] = getActualUrl(input);
        auto actualUrl = actualUrl_; // work around clang bug
@@ -193,7 +193,7 @@ struct MercurialInputScheme : InputScheme
                    return files.count(file);
                };

-                auto storePath = store->addToStore(input.getName(), actualUrl, FileIngestionMethod::Recursive, htSHA256, filter);
+                auto storePath = store->addToStore("source", actualUrl, FileIngestionMethod::Recursive, htSHA256, filter);

                return {
                    Tree(store->toRealPath(storePath), std::move(storePath)),
--- a/src/libfetchers/registry.cc
+++ b/src/libfetchers/registry.cc
@@ -124,13 +124,6 @@ std::shared_ptr<Registry> getUserRegistry()
    return userRegistry;
 }

-std::shared_ptr<Registry> getCustomRegistry(const Path & p)
-{
-    static auto customRegistry =
-        Registry::read(p, Registry::Custom);
-    return customRegistry;
-}
-
 static std::shared_ptr<Registry> flagRegistry =
    std::make_shared<Registry>(Registry::Flag);

--- a/src/libfetchers/registry.hh
+++ b/src/libfetchers/registry.hh
@@ -14,7 +14,6 @@ struct Registry
        User = 1,
        System = 2,
        Global = 3,
-        Custom = 4,
    };

    RegistryType type;
@@ -49,8 +48,6 @@ typedef std::vector<std::shared_ptr<Registry>> Registries;

 std::shared_ptr<Registry> getUserRegistry();

-std::shared_ptr<Registry> getCustomRegistry(const Path & p);
-
 Path getUserRegistryPath();

 Registries getRegistries(ref<Store> store);
--- a/src/libfetchers/tarball.cc
+++ b/src/libfetchers/tarball.cc
@@ -196,7 +196,7 @@ struct TarballInputScheme : InputScheme
        if (maybeGetStrAttr(attrs, "type") != "tarball") return {};

        for (auto & [name, value] : attrs)
-            if (name != "type" && name != "url" && /* name != "hash" && */ name != "narHash" && name != "name")
+            if (name != "type" && name != "url" && /* name != "hash" && */ name != "narHash")
                throw Error("unsupported tarball input attribute '%s'", name);

        Input input;
@@ -226,7 +226,7 @@ struct TarballInputScheme : InputScheme

    std::pair<Tree, Input> fetch(ref<Store> store, const Input & input) override
    {
-        auto tree = downloadTarball(store, getStrAttr(input.attrs, "url"), input.getName(), false).first;
+        auto tree = downloadTarball(store, getStrAttr(input.attrs, "url"), "source", false).first;
        return {std::move(tree), input};
    }
 };
--- a/src/libmain/progress-bar.cc
+++ b/src/libmain/progress-bar.cc
@@ -484,7 +484,7 @@ Logger * makeProgressBar(bool printBuildLogs)
 {
    return new ProgressBar(
        printBuildLogs,
-        shouldANSI()
+        isatty(STDERR_FILENO) && getEnv("TERM").value_or("dumb") != "dumb"
    );
 }

--- a/src/libmain/shared.cc
+++ b/src/libmain/shared.cc
@@ -238,7 +238,7 @@ LegacyArgs::LegacyArgs(const std::string & programName,
    addFlag({
        .longName = "no-gc-warning",
        .description = "Disable warnings about not using `--add-root`.",
-        .handler = {&gcWarning, false},
+        .handler = {&gcWarning, true},
    });

    addFlag({
--- a/src/libstore/build/derivation-goal.cc
+++ b/src/libstore/build/derivation-goal.cc
@@ -143,6 +143,7 @@ void DerivationGoal::work()
    (this->*state)();
 }

+
 void DerivationGoal::addWantedOutputs(const StringSet & outputs)
 {
    /* If we already want all outputs, there is nothing to do. */
@@ -544,7 +545,7 @@ void DerivationGoal::tryToBuild()
    PathSet lockFiles;
    /* FIXME: Should lock something like the drv itself so we don't build same
       CA drv concurrently */
-    if (dynamic_cast<LocalStore *>(&worker.store)) {
+    if (dynamic_cast<LocalStore *>(&worker.store))
        /* If we aren't a local store, we might need to use the local store as
           a build remote, but that would cause a deadlock. */
        /* FIXME: Make it so we can use ourselves as a build remote even if we
@@ -552,15 +553,9 @@ void DerivationGoal::tryToBuild()
        /* FIXME: find some way to lock for scheduling for the other stores so
           a forking daemon with --store still won't farm out redundant builds.
           */
-        for (auto & i : drv->outputsAndOptPaths(worker.store)) {
+        for (auto & i : drv->outputsAndOptPaths(worker.store))
            if (i.second.second)
                lockFiles.insert(worker.store.Store::toRealPath(*i.second.second));
-            else
-                lockFiles.insert(
-                    worker.store.Store::toRealPath(drvPath) + "!" + i.first
-                );
-        }
-    }

    if (!outputLocks.lockPaths(lockFiles, "", false)) {
        if (!actLock)
@@ -763,7 +758,6 @@ void runPostBuildHook(

    hookEnvironment.emplace("DRV_PATH", store.printStorePath(drvPath));
    hookEnvironment.emplace("OUT_PATHS", chomp(concatStringsSep(" ", store.printStorePathSet(outputPaths))));
-    hookEnvironment.emplace("NIX_CONFIG", globalConfig.toKeyValue());

    RunOptions opts(settings.postBuildHook, {});
    opts.environment = hookEnvironment;
@@ -1080,6 +1074,42 @@ HookReply DerivationGoal::tryBuildHook()
 }


+StorePathSet DerivationGoal::exportReferences(const StorePathSet & storePaths)
+{
+    StorePathSet paths;
+
+    for (auto & storePath : storePaths) {
+        if (!inputPaths.count(storePath))
+            throw BuildError("cannot export references of path '%s' because it is not in the input closure of the derivation", worker.store.printStorePath(storePath));
+
+        worker.store.computeFSClosure({storePath}, paths);
+    }
+
+    /* If there are derivations in the graph, then include their
+       outputs as well.  This is useful if you want to do things
+       like passing all build-time dependencies of some path to a
+       derivation that builds a NixOS DVD image. */
+    auto paths2 = paths;
+
+    for (auto & j : paths2) {
+        if (j.isDerivation()) {
+            Derivation drv = worker.store.derivationFromPath(j);
+            for (auto & k : drv.outputsAndOptPaths(worker.store)) {
+                if (!k.second.second)
+                    /* FIXME: I am confused why we are calling
+                       `computeFSClosure` on the output path, rather than
+                       derivation itself. That doesn't seem right to me, so I
+                       won't try to implemented this for CA derivations. */
+                    throw UnimplementedError("exportReferences on CA derivations is not yet implemented");
+                worker.store.computeFSClosure(*k.second.second, paths);
+            }
+        }
+    }
+
+    return paths;
+}
+
+
 void DerivationGoal::registerOutputs()
 {
    /* When using a build hook, the build hook can register the output
--- a/src/libstore/build/local-derivation-goal.cc
+++ b/src/libstore/build/local-derivation-goal.cc
@@ -518,7 +518,7 @@ void LocalDerivationGoal::startBuilder()
            /* Write closure info to <fileName>. */
            writeFile(tmpDir + "/" + fileName,
                worker.store.makeValidityRegistration(
-                    worker.store.exportReferences({storePath}, inputPaths), false, false));
+                    exportReferences({storePath}), false, false));
        }
    }

@@ -726,7 +726,7 @@ void LocalDerivationGoal::startBuilder()
    Path logFile = openLogFile();

    /* Create a pipe to get the output of the builder. */
-    //builderOut.create();
+    builderOut.create();

    builderOut.readSide = posix_openpt(O_RDWR | O_NOCTTY);
    if (!builderOut.readSide)
@@ -1084,28 +1084,113 @@ void LocalDerivationGoal::initEnv()
 }


+static std::regex shVarName("[A-Za-z_][A-Za-z0-9_]*");
+
+
 void LocalDerivationGoal::writeStructuredAttrs()
 {
-    if (auto structAttrsJson = parsedDrv->prepareStructuredAttrs(worker.store, inputPaths)) {
-        auto json = structAttrsJson.value();
-        nlohmann::json rewritten;
-        for (auto & [i, v] : json["outputs"].get<nlohmann::json::object_t>()) {
-            /* The placeholder must have a rewrite, so we use it to cover both the
-               cases where we know or don't know the output path ahead of time. */
-            rewritten[i] = rewriteStrings(v, inputRewrites);
+    auto structuredAttrs = parsedDrv->getStructuredAttrs();
+    if (!structuredAttrs) return;
+
+    auto json = *structuredAttrs;
+
+    /* Add an "outputs" object containing the output paths. */
+    nlohmann::json outputs;
+    for (auto & i : drv->outputs) {
+        /* The placeholder must have a rewrite, so we use it to cover both the
+           cases where we know or don't know the output path ahead of time. */
+        outputs[i.first] = rewriteStrings(hashPlaceholder(i.first), inputRewrites);
+    }
+    json["outputs"] = outputs;
+
+    /* Handle exportReferencesGraph. */
+    auto e = json.find("exportReferencesGraph");
+    if (e != json.end() && e->is_object()) {
+        for (auto i = e->begin(); i != e->end(); ++i) {
+            std::ostringstream str;
+            {
+                JSONPlaceholder jsonRoot(str, true);
+                StorePathSet storePaths;
+                for (auto & p : *i)
+                    storePaths.insert(worker.store.parseStorePath(p.get<std::string>()));
+                worker.store.pathInfoToJSON(jsonRoot,
+                    exportReferences(storePaths), false, true);
+            }
+            json[i.key()] = nlohmann::json::parse(str.str()); // urgh
+        }
+    }
+
+    writeFile(tmpDir + "/.attrs.json", rewriteStrings(json.dump(), inputRewrites));
+    chownToBuilder(tmpDir + "/.attrs.json");
+
+    /* As a convenience to bash scripts, write a shell file that
+       maps all attributes that are representable in bash -
+       namely, strings, integers, nulls, Booleans, and arrays and
+       objects consisting entirely of those values. (So nested
+       arrays or objects are not supported.) */
+
+    auto handleSimpleType = [](const nlohmann::json & value) -> std::optional<std::string> {
+        if (value.is_string())
+            return shellEscape(value);
+
+        if (value.is_number()) {
+            auto f = value.get<float>();
+            if (std::ceil(f) == f)
+                return std::to_string(value.get<int>());
        }

-        json["outputs"] = rewritten;
+        if (value.is_null())
+            return std::string("''");

-        auto jsonSh = writeStructuredAttrsShell(json);
+        if (value.is_boolean())
+            return value.get<bool>() ? std::string("1") : std::string("");

-        writeFile(tmpDir + "/.attrs.sh", rewriteStrings(jsonSh, inputRewrites));
-        chownToBuilder(tmpDir + "/.attrs.sh");
-        env["NIX_ATTRS_SH_FILE"] = tmpDir + "/.attrs.sh";
-        writeFile(tmpDir + "/.attrs.json", rewriteStrings(json.dump(), inputRewrites));
-        chownToBuilder(tmpDir + "/.attrs.json");
-        env["NIX_ATTRS_JSON_FILE"] = tmpDir + "/.attrs.json";
+        return {};
+    };
+
+    std::string jsonSh;
+
+    for (auto i = json.begin(); i != json.end(); ++i) {
+
+        if (!std::regex_match(i.key(), shVarName)) continue;
+
+        auto & value = i.value();
+
+        auto s = handleSimpleType(value);
+        if (s)
+            jsonSh += fmt("declare %s=%s\n", i.key(), *s);
+
+        else if (value.is_array()) {
+            std::string s2;
+            bool good = true;
+
+            for (auto i = value.begin(); i != value.end(); ++i) {
+                auto s3 = handleSimpleType(i.value());
+                if (!s3) { good = false; break; }
+                s2 += *s3; s2 += ' ';
+            }
+
+            if (good)
+                jsonSh += fmt("declare -a %s=(%s)\n", i.key(), s2);
+        }
+
+        else if (value.is_object()) {
+            std::string s2;
+            bool good = true;
+
+            for (auto i = value.begin(); i != value.end(); ++i) {
+                auto s3 = handleSimpleType(i.value());
+                if (!s3) { good = false; break; }
+                s2 += fmt("[%s]=%s ", shellEscape(i.key()), *s3);
+            }
+
+            if (good)
+                jsonSh += fmt("declare -A %s=(%s)\n", i.key(), s2);
+        }
    }
+
+    writeFile(tmpDir + "/.attrs.sh", rewriteStrings(jsonSh, inputRewrites));
+    chownToBuilder(tmpDir + "/.attrs.sh");
 }


@@ -1669,7 +1754,7 @@ void LocalDerivationGoal::runChild()
                /* N.B. it is realistic that these paths might not exist. It
                   happens when testing Nix building fixed-output derivations
                   within a pure derivation. */
-                for (auto & path : { "/etc/resolv.conf", "/etc/services", "/etc/hosts" })
+                for (auto & path : { "/etc/resolv.conf", "/etc/services", "/etc/hosts", "/var/run/nscd/socket" })
                    if (pathExists(path))
                        ss.push_back(path);
            }
--- a/src/libstore/globals.hh
+++ b/src/libstore/globals.hh
@@ -956,9 +956,6 @@ public:
          resolves to a different location from that of the build machine. You
          can enable this setting if you are sure you're not going to do that.
        )"};
-
-    Setting<bool> useRegistries{this, true, "use-registries",
-        "Whether to use flake registries to resolve flake references."};
 };


--- a/src/libstore/local-store.cc
+++ b/src/libstore/local-store.cc
@@ -342,7 +342,7 @@ LocalStore::LocalStore(const Params & params)
    if (settings.isExperimentalFeatureEnabled("ca-derivations")) {
        state->stmts->RegisterRealisedOutput.create(state->db,
            R"(
-                insert into Realisations (drvPath, outputName, outputPath, signatures)
+                insert or replace into Realisations (drvPath, outputName, outputPath, signatures)
                values (?, ?, (select id from ValidPaths where path = ?), ?)
                ;
            )");
@@ -379,7 +379,7 @@ LocalStore::LocalStore(const Params & params)
            R"(
                insert or replace into RealisationsRefs (referrer, realisationReference)
                values (
-                    (select id from Realisations where drvPath = ? and outputName = ?),
+                    ?,
                    (select id from Realisations where drvPath = ? and outputName = ?));
            )");
    }
@@ -748,6 +748,7 @@ void LocalStore::registerDrvOutput(const Realisation & info)
                (concatStringsSep(" ", info.signatures))
                .exec();
        }
+        uint64_t myId = state->db.getLastInsertedRowId();
        for (auto & [outputId, depPath] : info.dependentRealisations) {
            auto localRealisation = queryRealisationCore_(*state, outputId);
            if (!localRealisation)
@@ -760,8 +761,7 @@ void LocalStore::registerDrvOutput(const Realisation & info)
                            "match what we have locally",
                    info.id.to_string(), outputId.to_string());
            state->stmts->AddRealisationReference.use()
-                (info.id.strHash())
-                (info.id.outputName)
+                (myId)
                (outputId.strHash())
                (outputId.outputName)
                .exec();
--- a/src/libstore/local.mk
+++ b/src/libstore/local.mk
@@ -9,11 +9,11 @@ libstore_SOURCES := $(wildcard $(d)/*.cc $(d)/builtins/*.cc $(d)/build/*.cc)
 libstore_LIBS = libutil

 libstore_LDFLAGS = $(SQLITE3_LIBS) -lbz2 $(LIBCURL_LIBS) $(SODIUM_LIBS) -pthread
-ifdef HOST_LINUX
+ifeq ($(OS), Linux)
 libstore_LDFLAGS += -ldl
 endif

-ifdef HOST_DARWIN
+ifeq ($(OS), Darwin)
 libstore_FILES = sandbox-defaults.sb sandbox-minimal.sb sandbox-network.sb
 endif

@@ -23,7 +23,7 @@ ifeq ($(ENABLE_S3), 1)
 	libstore_LDFLAGS += -laws-cpp-sdk-transfer -laws-cpp-sdk-s3 -laws-cpp-sdk-core
 endif

-ifdef HOST_SOLARIS
+ifeq ($(OS), SunOS)
 	libstore_LDFLAGS += -lsocket
 endif

--- a/src/libstore/machines.cc
+++ b/src/libstore/machines.cc
@@ -16,18 +16,13 @@ Machine::Machine(decltype(storeUri) storeUri,
    decltype(mandatoryFeatures) mandatoryFeatures,
    decltype(sshPublicHostKey) sshPublicHostKey) :
    storeUri(
-        // Backwards compatibility: if the URI is schemeless, is not a path,
-        // and is not one of the special store connection words, prepend
-        // ssh://.
+        // Backwards compatibility: if the URI is a hostname,
+        // prepend ssh://.
        storeUri.find("://") != std::string::npos
-        || storeUri.find("/") != std::string::npos
-        || storeUri == "auto"
-        || storeUri == "daemon"
-        || storeUri == "local"
-        || hasPrefix(storeUri, "auto?")
-        || hasPrefix(storeUri, "daemon?")
-        || hasPrefix(storeUri, "local?")
-        || hasPrefix(storeUri, "?")
+        || hasPrefix(storeUri, "local")
+        || hasPrefix(storeUri, "remote")
+        || hasPrefix(storeUri, "auto")
+        || hasPrefix(storeUri, "/")
        ? storeUri
        : "ssh://" + storeUri),
    systemTypes(systemTypes),
--- a/src/libstore/parsed-derivations.cc
+++ b/src/libstore/parsed-derivations.cc
@@ -1,8 +1,6 @@
 #include "parsed-derivations.hh"

 #include <nlohmann/json.hpp>
-#include <regex>
-#include "json.hh"

 namespace nix {

@@ -125,107 +123,4 @@ bool ParsedDerivation::substitutesAllowed() const
    return getBoolAttr("allowSubstitutes", true);
 }

-static std::regex shVarName("[A-Za-z_][A-Za-z0-9_]*");
-
-std::optional<nlohmann::json> ParsedDerivation::prepareStructuredAttrs(Store & store, const StorePathSet & inputPaths)
-{
-    auto structuredAttrs = getStructuredAttrs();
-    if (!structuredAttrs) return std::nullopt;
-
-    auto json = *structuredAttrs;
-
-    /* Add an "outputs" object containing the output paths. */
-    nlohmann::json outputs;
-    for (auto & i : drv.outputs)
-        outputs[i.first] = hashPlaceholder(i.first);
-    json["outputs"] = outputs;
-
-    /* Handle exportReferencesGraph. */
-    auto e = json.find("exportReferencesGraph");
-    if (e != json.end() && e->is_object()) {
-        for (auto i = e->begin(); i != e->end(); ++i) {
-            std::ostringstream str;
-            {
-                JSONPlaceholder jsonRoot(str, true);
-                StorePathSet storePaths;
-                for (auto & p : *i)
-                    storePaths.insert(store.parseStorePath(p.get<std::string>()));
-                store.pathInfoToJSON(jsonRoot,
-                    store.exportReferences(storePaths, inputPaths), false, true);
-            }
-            json[i.key()] = nlohmann::json::parse(str.str()); // urgh
-        }
-    }
-
-    return json;
-}
-
-/* As a convenience to bash scripts, write a shell file that
-   maps all attributes that are representable in bash -
-   namely, strings, integers, nulls, Booleans, and arrays and
-   objects consisting entirely of those values. (So nested
-   arrays or objects are not supported.) */
-std::string writeStructuredAttrsShell(const nlohmann::json & json)
-{
-
-    auto handleSimpleType = [](const nlohmann::json & value) -> std::optional<std::string> {
-        if (value.is_string())
-            return shellEscape(value);
-
-        if (value.is_number()) {
-            auto f = value.get<float>();
-            if (std::ceil(f) == f)
-                return std::to_string(value.get<int>());
-        }
-
-        if (value.is_null())
-            return std::string("''");
-
-        if (value.is_boolean())
-            return value.get<bool>() ? std::string("1") : std::string("");
-
-        return {};
-    };
-
-    std::string jsonSh;
-
-    for (auto & [key, value] : json.items()) {
-
-        if (!std::regex_match(key, shVarName)) continue;
-
-        auto s = handleSimpleType(value);
-        if (s)
-            jsonSh += fmt("declare %s=%s\n", key, *s);
-
-        else if (value.is_array()) {
-            std::string s2;
-            bool good = true;
-
-            for (auto & value2 : value) {
-                auto s3 = handleSimpleType(value2);
-                if (!s3) { good = false; break; }
-                s2 += *s3; s2 += ' ';
-            }
-
-            if (good)
-                jsonSh += fmt("declare -a %s=(%s)\n", key, s2);
-        }
-
-        else if (value.is_object()) {
-            std::string s2;
-            bool good = true;
-
-            for (auto & [key2, value2] : value.items()) {
-                auto s3 = handleSimpleType(value2);
-                if (!s3) { good = false; break; }
-                s2 += fmt("[%s]=%s ", shellEscape(key2), *s3);
-            }
-
-            if (good)
-                jsonSh += fmt("declare -A %s=(%s)\n", key, s2);
-        }
-    }
-
-    return jsonSh;
-}
 }
--- a/src/libstore/parsed-derivations.hh
+++ b/src/libstore/parsed-derivations.hh
@@ -36,10 +36,6 @@ public:
    bool willBuildLocally(Store & localStore) const;

    bool substitutesAllowed() const;
-
-    std::optional<nlohmann::json> prepareStructuredAttrs(Store & store, const StorePathSet & inputPaths);
 };

-std::string writeStructuredAttrsShell(const nlohmann::json & json);
-
 }
--- a/src/libstore/profiles.cc
+++ b/src/libstore/profiles.cc
@@ -211,15 +211,12 @@ void deleteGenerationsOlderThan(const Path & profile, time_t t, bool dryRun)

 void deleteGenerationsOlderThan(const Path & profile, const string & timeSpec, bool dryRun)
 {
-    if (timeSpec.empty() || timeSpec[timeSpec.size() - 1] != 'd')
-        throw UsageError("invalid number of days specifier '%1%', expected something like '14d'", timeSpec);
-
    time_t curTime = time(0);
    string strDays = string(timeSpec, 0, timeSpec.size() - 1);
    auto days = string2Int<int>(strDays);

    if (!days || *days < 1)
-        throw UsageError("invalid number of days specifier '%1%'", timeSpec);
+        throw Error("invalid number of days specifier '%1%'", timeSpec);

    time_t oldTime = curTime - *days * 24 * 3600;

--- a/src/libstore/realisation.cc
+++ b/src/libstore/realisation.cc
@@ -144,16 +144,8 @@ bool Realisation::isCompatibleWith(const Realisation & other) const
 {
    assert (id == other.id);
    if (outPath == other.outPath) {
-        if (dependentRealisations.empty() != other.dependentRealisations.empty()) {
-            warn(
-                "Encountered a realisation for '%s' with an empty set of "
-                "dependencies. This is likely an artifact from an older Nix. "
-                "I’ll try to fix the realisation if I can",
-                id.to_string());
-            return true;
-        } else if (dependentRealisations == other.dependentRealisations) {
-            return true;
-        }
+        assert(dependentRealisations == other.dependentRealisations);
+        return true;
    }
    return false;
 }
--- a/src/libstore/store-api.cc
+++ b/src/libstore/store-api.cc
@@ -634,42 +634,6 @@ string Store::makeValidityRegistration(const StorePathSet & paths,
 }


-StorePathSet Store::exportReferences(const StorePathSet & storePaths, const StorePathSet & inputPaths)
-{
-    StorePathSet paths;
-
-    for (auto & storePath : storePaths) {
-        if (!inputPaths.count(storePath))
-            throw BuildError("cannot export references of path '%s' because it is not in the input closure of the derivation", printStorePath(storePath));
-
-        computeFSClosure({storePath}, paths);
-    }
-
-    /* If there are derivations in the graph, then include their
-       outputs as well.  This is useful if you want to do things
-       like passing all build-time dependencies of some path to a
-       derivation that builds a NixOS DVD image. */
-    auto paths2 = paths;
-
-    for (auto & j : paths2) {
-        if (j.isDerivation()) {
-            Derivation drv = derivationFromPath(j);
-            for (auto & k : drv.outputsAndOptPaths(*this)) {
-                if (!k.second.second)
-                    /* FIXME: I am confused why we are calling
-                       `computeFSClosure` on the output path, rather than
-                       derivation itself. That doesn't seem right to me, so I
-                       won't try to implemented this for CA derivations. */
-                    throw UnimplementedError("exportReferences on CA derivations is not yet implemented");
-                computeFSClosure(*k.second.second, paths);
-            }
-        }
-    }
-
-    return paths;
-}
-
-
 void Store::pathInfoToJSON(JSONPlaceholder & jsonOut, const StorePathSet & storePaths,
    bool includeImpureInfo, bool showClosureSize,
    Base hashBase,
@@ -839,14 +803,14 @@ std::map<StorePath, StorePath> copyPaths(ref<Store> srcStore, ref<Store> dstStor
        // Copy the realisation closure
        processGraph<Realisation>(
            pool, Realisation::closure(*srcStore, toplevelRealisations),
-            [&](const Realisation & current) -> std::set<Realisation> {
+            [&](const Realisation& current) -> std::set<Realisation> {
                std::set<Realisation> children;
-                for (const auto & [drvOutput, _] : current.dependentRealisations) {
+                for (const auto& [drvOutput, _] : current.dependentRealisations) {
                    auto currentChild = srcStore->queryRealisation(drvOutput);
                    if (!currentChild)
                        throw Error(
-                            "incomplete realisation closure: '%s' is a "
-                            "dependency of '%s' but isn't registered",
+                            "Incomplete realisation closure: '%s' is a "
+                            "dependency of '%s' but isn’t registered",
                            drvOutput.to_string(), current.id.to_string());
                    children.insert(*currentChild);
                }
--- a/src/libstore/store-api.hh
+++ b/src/libstore/store-api.hh
@@ -543,7 +543,7 @@ public:
    /* Add a store path as a temporary root of the garbage collector.
       The root disappears as soon as we exit. */
    virtual void addTempRoot(const StorePath & path)
-    { debug("not creating temporary root, store doesn't support GC"); }
+    { warn("not creating temp root, store doesn't support GC"); }

    /* Add an indirect root, which is merely a symlink to `path' from
       /nix/var/nix/gcroots/auto/<hash of `path'>.  `path' is supposed
@@ -697,11 +697,6 @@ public:

    const Stats & getStats();

-    /* Computes the full closure of of a set of store-paths for e.g.
-       derivations that need this information for `exportReferencesGraph`.
-     */
-    StorePathSet exportReferences(const StorePathSet & storePaths, const StorePathSet & inputPaths);
-
    /* Return the build log of the specified store path, if available,
       or null otherwise. */
    virtual std::shared_ptr<std::string> getBuildLog(const StorePath & path)
@@ -767,7 +762,7 @@ std::map<StorePath, StorePath> copyPaths(ref<Store> srcStore, ref<Store> dstStor
    CheckSigsFlag checkSigs = CheckSigs,
    SubstituteFlag substitute = NoSubstitute);
 std::map<StorePath, StorePath> copyPaths(ref<Store> srcStore, ref<Store> dstStore,
-    const StorePathSet & paths,
+    const StorePathSet& paths,
    RepairFlag repair = NoRepair,
    CheckSigsFlag checkSigs = CheckSigs,
    SubstituteFlag substitute = NoSubstitute);
--- a/src/libutil/config.cc
+++ b/src/libutil/config.cc
@@ -152,16 +152,6 @@ nlohmann::json Config::toJSON()
    return res;
 }

-std::string Config::toKeyValue()
-{
-    auto res = std::string();
-    for (auto & s : _settings)
-        if (!s.second.isAlias) {
-            res += fmt("%s = %s\n", s.first, s.second.setting->to_string());
-        }
-    return res;
-}
-
 void Config::convertToArgs(Args & args, const std::string & category)
 {
    for (auto & s : _settings)
@@ -395,16 +385,6 @@ nlohmann::json GlobalConfig::toJSON()
    return res;
 }

-std::string GlobalConfig::toKeyValue()
-{
-    std::string res;
-    std::map<std::string, Config::SettingInfo> settings;
-    globalConfig.getSettings(settings);
-    for (auto & s : settings)
-        res += fmt("%s = %s\n", s.first, s.second.value);
-    return res;
-}
-
 void GlobalConfig::convertToArgs(Args & args, const std::string & category)
 {
    for (auto & config : *configRegistrations)
--- a/src/libutil/config.hh
+++ b/src/libutil/config.hh
@@ -99,12 +99,6 @@ public:
     */
    virtual nlohmann::json toJSON() = 0;

-    /**
-     * Outputs all settings in a key-value pair format suitable to be used as
-     * `nix.conf`
-     */
-    virtual std::string toKeyValue() = 0;
-
    /**
     * Converts settings to `Args` to be used on the command line interface
     * - args: args to write to
@@ -175,8 +169,6 @@ public:

    nlohmann::json toJSON() override;

-    std::string toKeyValue() override;
-
    void convertToArgs(Args & args, const std::string & category) override;
 };

@@ -338,8 +330,6 @@ struct GlobalConfig : public AbstractConfig

    nlohmann::json toJSON() override;

-    std::string toKeyValue() override;
-
    void convertToArgs(Args & args, const std::string & category) override;

    struct Register
--- a/src/libutil/logging.cc
+++ b/src/libutil/logging.cc
@@ -46,7 +46,7 @@ public:
        : printBuildLogs(printBuildLogs)
    {
        systemd = getEnv("IN_SYSTEMD") == "1";
-        tty = shouldANSI();
+        tty = isatty(STDERR_FILENO);
    }

    bool isVerbose() override {
--- a/src/libutil/ref.hh
+++ b/src/libutil/ref.hh
@@ -73,16 +73,6 @@ public:
        return ref<T2>((std::shared_ptr<T2>) p);
    }

-    bool operator == (const ref<T> & other) const
-    {
-        return p == other.p;
-    }
-
-    bool operator != (const ref<T> & other) const
-    {
-        return p != other.p;
-    }
-
 private:

    template<typename T2, typename... Args>
--- a/src/libutil/url.cc
+++ b/src/libutil/url.cc
@@ -32,7 +32,7 @@ ParsedURL parseURL(const std::string & url)
        auto isFile = scheme.find("file") != std::string::npos;

        if (authority && *authority != "" && isFile)
-            throw BadURL("file:// URL '%s' has unexpected authority '%s'",
+            throw Error("file:// URL '%s' has unexpected authority '%s'",
                url, *authority);

        if (isFile && path.empty())
--- a/src/libutil/util.cc
+++ b/src/libutil/util.cc
@@ -413,7 +413,7 @@ static void _deletePath(int parentfd, const Path & path, uint64_t & bytesFreed)
        }

        int fd = openat(parentfd, path.c_str(), O_RDONLY);
-        if (fd == -1)
+        if (!fd)
            throw SysError("opening directory '%1%'", path);
        AutoCloseDir dir(fdopendir(fd));
        if (!dir)
@@ -435,9 +435,12 @@ static void _deletePath(const Path & path, uint64_t & bytesFreed)
    if (dir == "")
        dir = "/";

-    AutoCloseFD dirfd{open(dir.c_str(), O_RDONLY)};
+    AutoCloseFD dirfd(open(dir.c_str(), O_RDONLY));
    if (!dirfd) {
+        // This really shouldn't fail silently, but it's left this way
+        // for backwards compatibility.
        if (errno == ENOENT) return;
+
        throw SysError("opening directory '%1%'", path);
    }

@@ -1369,12 +1372,6 @@ void ignoreException()
    }
 }

-bool shouldANSI()
-{
-    return isatty(STDERR_FILENO)
-        && getEnv("TERM").value_or("dumb") != "dumb"
-        && !getEnv("NO_COLOR").has_value();
-}

 std::string filterANSIEscapes(const std::string & s, bool filterAll, unsigned int width)
 {
--- a/src/libutil/util.hh
+++ b/src/libutil/util.hh
@@ -482,9 +482,6 @@ constexpr char treeLast[] = "└───";
 constexpr char treeLine[] = "│   ";
 constexpr char treeNull[] = "    ";

-/* Determine whether ANSI escape sequences are appropriate for the
-   present output. */
-bool shouldANSI();

 /* Truncate a string to 'width' printable characters. If 'filterAll'
   is true, all ANSI escape sequences are filtered out. Otherwise,
--- a/src/nix-build/nix-build.cc
+++ b/src/nix-build/nix-build.cc
@@ -1,15 +1,10 @@
 #include <cstring>
 #include <fstream>
 #include <iostream>
-#include <filesystem>
 #include <regex>
 #include <sstream>
 #include <vector>
-#include <map>

-#include <nlohmann/json.hpp>
-
-#include "parsed-derivations.hh"
 #include "store-api.hh"
 #include "local-fs-store.hh"
 #include "globals.hh"
@@ -433,45 +428,12 @@ static void main_nix_build(int argc, char * * argv)
            } else
                env[var.first] = var.second;

-        std::string structuredAttrsRC;
-
-        if (env.count("__json")) {
-            StorePathSet inputs;
-            for (auto & [depDrvPath, wantedDepOutputs] : drv.inputDrvs) {
-                auto outputs = store->queryPartialDerivationOutputMap(depDrvPath);
-                for (auto & i : wantedDepOutputs) {
-                    auto o = outputs.at(i);
-                    store->computeFSClosure(*o, inputs);
-                }
-            }
-
-            ParsedDerivation parsedDrv(
-                StorePath(store->parseStorePath(drvInfo.queryDrvPath())),
-                drv
-            );
-
-            if (auto structAttrs = parsedDrv.prepareStructuredAttrs(*store, inputs)) {
-                auto json = structAttrs.value();
-                structuredAttrsRC = writeStructuredAttrsShell(json);
-
-                auto attrsJSON = (Path) tmpDir + "/.attrs.json";
-                writeFile(attrsJSON, json.dump());
-
-                auto attrsSH = (Path) tmpDir + "/.attrs.sh";
-                writeFile(attrsSH, structuredAttrsRC);
-
-                env["NIX_ATTRS_SH_FILE"] = attrsSH;
-                env["NIX_ATTRS_JSON_FILE"] = attrsJSON;
-                keepTmp = true;
-            }
-        }
-
        /* Run a shell using the derivation's environment.  For
           convenience, source $stdenv/setup to setup additional
           environment variables and shell functions.  Also don't
           lose the current $PATH directories. */
        auto rcfile = (Path) tmpDir + "/rc";
-        std::string rc = fmt(
+        writeFile(rcfile, fmt(
                R"(_nix_shell_clean_tmpdir() { rm -rf %1%; }; )"s +
                (keepTmp ?
                    "trap _nix_shell_clean_tmpdir EXIT; "
@@ -480,9 +442,8 @@ static void main_nix_build(int argc, char * * argv)
                    "_nix_shell_clean_tmpdir; ") +
                (pure ? "" : "[ -n \"$PS1\" ] && [ -e ~/.bashrc ] && source ~/.bashrc;") +
                "%2%"
-                "dontAddDisableDepTrack=1;\n"
-                + structuredAttrsRC +
-                "\n[ -e $stdenv/setup ] && source $stdenv/setup; "
+                "dontAddDisableDepTrack=1; "
+                "[ -e $stdenv/setup ] && source $stdenv/setup; "
                "%3%"
                "PATH=%4%:\"$PATH\"; "
                "SHELL=%5%; "
@@ -500,9 +461,7 @@ static void main_nix_build(int argc, char * * argv)
                shellEscape(dirOf(*shell)),
                shellEscape(*shell),
                (getenv("TZ") ? (string("export TZ=") + shellEscape(getenv("TZ")) + "; ") : ""),
-                envCommand);
-        vomit("Sourcing nix-shell with file %s and contents:\n%s", rcfile, rc);
-        writeFile(rcfile, rc);
+                envCommand));

        Strings envStrs;
        for (auto & i : env)
--- a/src/nix/develop.cc
+++ b/src/nix/develop.cc
@@ -8,7 +8,7 @@
 #include "affinity.hh"
 #include "progress-bar.hh"

-#include <nlohmann/json.hpp>
+#include <regex>

 using namespace nix;

@@ -25,143 +25,95 @@ static DevelopSettings developSettings;

 static GlobalConfig::Register rDevelopSettings(&developSettings);

+struct Var
+{
+    bool exported = true;
+    bool associative = false;
+    std::string quoted; // quoted string or array
+};
+
 struct BuildEnvironment
 {
-    struct String
-    {
-        bool exported;
-        std::string value;
-
-        bool operator == (const String & other) const
-        {
-            return exported == other.exported && value == other.value;
-        }
-    };
-
-    using Array = std::vector<std::string>;
-
-    using Associative = std::map<std::string, std::string>;
-
-    using Value = std::variant<String, Array, Associative>;
-
-    std::map<std::string, Value> vars;
-    std::map<std::string, std::string> bashFunctions;
-
-    static BuildEnvironment fromJSON(std::string_view in)
-    {
-        BuildEnvironment res;
-
-        std::set<std::string> exported;
-
-        auto json = nlohmann::json::parse(in);
-
-        for (auto & [name, info] : json["variables"].items()) {
-            std::string type = info["type"];
-            if (type == "var" || type == "exported")
-                res.vars.insert({name, BuildEnvironment::String { .exported = type == "exported", .value = info["value"] }});
-            else if (type == "array")
-                res.vars.insert({name, (Array) info["value"]});
-            else if (type == "associative")
-                res.vars.insert({name, (Associative) info["value"]});
-        }
-
-        for (auto & [name, def] : json["bashFunctions"].items()) {
-            res.bashFunctions.insert({name, def});
-        }
-
-        return res;
-    }
-
-    std::string toJSON() const
-    {
-        auto res = nlohmann::json::object();
-
-        auto vars2 = nlohmann::json::object();
-        for (auto & [name, value] : vars) {
-            auto info = nlohmann::json::object();
-            if (auto str = std::get_if<String>(&value)) {
-                info["type"] = str->exported ? "exported" : "var";
-                info["value"] = str->value;
-            }
-            else if (auto arr = std::get_if<Array>(&value)) {
-                info["type"] = "array";
-                info["value"] = *arr;
-            }
-            else if (auto arr = std::get_if<Associative>(&value)) {
-                info["type"] = "associative";
-                info["value"] = *arr;
-            }
-            vars2[name] = std::move(info);
-        }
-        res["variables"] = std::move(vars2);
-
-        res["bashFunctions"] = bashFunctions;
-
-        auto json = res.dump();
-
-        assert(BuildEnvironment::fromJSON(json) == *this);
-
-        return json;
-    }
-
-    void toBash(std::ostream & out, const std::set<std::string> & ignoreVars) const
-    {
-        for (auto & [name, value] : vars) {
-            if (!ignoreVars.count(name)) {
-                if (auto str = std::get_if<String>(&value)) {
-                    out << fmt("%s=%s\n", name, shellEscape(str->value));
-                    if (str->exported)
-                        out << fmt("export %s\n", name);
-                }
-                else if (auto arr = std::get_if<Array>(&value)) {
-                    out << "declare -a " << name << "=(";
-                    for (auto & s : *arr)
-                        out << shellEscape(s) << " ";
-                    out << ")\n";
-                }
-                else if (auto arr = std::get_if<Associative>(&value)) {
-                    out << "declare -A " << name << "=(";
-                    for (auto & [n, v] : *arr)
-                        out << "[" << shellEscape(n) << "]=" << shellEscape(v) << " ";
-                    out << ")\n";
-                }
-            }
-        }
-
-        for (auto & [name, def] : bashFunctions) {
-            out << name << " ()\n{\n" << def << "}\n";
-        }
-    }
-
-    static std::string getString(const Value & value)
-    {
-        if (auto str = std::get_if<String>(&value))
-            return str->value;
-        else
-            throw Error("bash variable is not a string");
-    }
-
-    static Array getStrings(const Value & value)
-    {
-        if (auto str = std::get_if<String>(&value))
-            return tokenizeString<Array>(str->value);
-        else if (auto arr = std::get_if<Array>(&value)) {
-            return *arr;
-        } else if (auto assoc = std::get_if<Associative>(&value)) {
-            Array assocKeys;
-            std::for_each(assoc->begin(), assoc->end(), [&](auto & n) { assocKeys.push_back(n.first); });
-            return assocKeys;
-        }
-        else
-            throw Error("bash variable is not a string or array");
-    }
-
-    bool operator == (const BuildEnvironment & other) const
-    {
-        return vars == other.vars && bashFunctions == other.bashFunctions;
-    }
+    std::map<std::string, Var> env;
+    std::string bashFunctions;
 };

+BuildEnvironment readEnvironment(const Path & path)
+{
+    BuildEnvironment res;
+
+    std::set<std::string> exported;
+
+    debug("reading environment file '%s'", path);
+
+    auto file = readFile(path);
+
+    auto pos = file.cbegin();
+
+    static std::string varNameRegex =
+        R"re((?:[a-zA-Z_][a-zA-Z0-9_]*))re";
+
+    static std::string simpleStringRegex =
+        R"re((?:[a-zA-Z0-9_/:\.\-\+=]*))re";
+
+    static std::string dquotedStringRegex =
+        R"re((?:\$?"(?:[^"\\]|\\[$`"\\\n])*"))re";
+
+    static std::string squotedStringRegex =
+        R"re((?:\$?(?:'(?:[^'\\]|\\[abeEfnrtv\\'"?])*'|\\')+))re";
+
+    static std::string indexedArrayRegex =
+        R"re((?:\(( *\[[0-9]+\]="(?:[^"\\]|\\.)*")*\)))re";
+
+    static std::regex declareRegex(
+        "^declare -a?x (" + varNameRegex + ")(=(" +
+        dquotedStringRegex + "|" + indexedArrayRegex + "))?\n");
+
+    static std::regex varRegex(
+        "^(" + varNameRegex + ")=(" + simpleStringRegex + "|" + squotedStringRegex + "|" + indexedArrayRegex + ")\n");
+
+    /* Note: we distinguish between an indexed and associative array
+       using the space before the closing parenthesis. Will
+       undoubtedly regret this some day. */
+    static std::regex assocArrayRegex(
+        "^(" + varNameRegex + ")=" + R"re((?:\(( *\[[^\]]+\]="(?:[^"\\]|\\.)*")* *\)))re" + "\n");
+
+    static std::regex functionRegex(
+        "^" + varNameRegex + " \\(\\) *\n");
+
+    while (pos != file.end()) {
+
+        std::smatch match;
+
+        if (std::regex_search(pos, file.cend(), match, declareRegex, std::regex_constants::match_continuous)) {
+            pos = match[0].second;
+            exported.insert(match[1]);
+        }
+
+        else if (std::regex_search(pos, file.cend(), match, varRegex, std::regex_constants::match_continuous)) {
+            pos = match[0].second;
+            res.env.insert({match[1], Var { .exported = exported.count(match[1]) > 0, .quoted = match[2] }});
+        }
+
+        else if (std::regex_search(pos, file.cend(), match, assocArrayRegex, std::regex_constants::match_continuous)) {
+            pos = match[0].second;
+            res.env.insert({match[1], Var { .associative = true, .quoted = match[2] }});
+        }
+
+        else if (std::regex_search(pos, file.cend(), match, functionRegex, std::regex_constants::match_continuous)) {
+            res.bashFunctions = std::string(pos, file.cend());
+            break;
+        }
+
+        else throw Error("shell environment '%s' has unexpected line '%s'",
+            path, file.substr(pos - file.cbegin(), 60));
+    }
+
+    res.env.erase("__output");
+
+    return res;
+}
+
 const static std::string getEnvSh =
    #include "get-env.sh.gen.hh"
    ;
@@ -233,15 +185,19 @@ StorePath getDerivationEnvironment(ref<Store> store, const StorePath & drvPath)

 struct Common : InstallableCommand, MixProfile
 {
-    std::set<std::string> ignoreVars{
+    std::set<string> ignoreVars{
        "BASHOPTS",
+        "EUID",
        "HOME", // FIXME: don't ignore in pure mode?
+        "HOSTNAME",
        "NIX_BUILD_TOP",
        "NIX_ENFORCE_PURITY",
        "NIX_LOG_FD",
        "NIX_REMOTE",
        "PPID",
+        "PWD",
        "SHELLOPTS",
+        "SHLVL",
        "SSL_CERT_FILE", // FIXME: only want to ignore /no-cert-file.crt
        "TEMP",
        "TEMPDIR",
@@ -277,10 +233,22 @@ struct Common : InstallableCommand, MixProfile

        out << "nix_saved_PATH=\"$PATH\"\n";

-        buildEnvironment.toBash(out, ignoreVars);
+        for (auto & i : buildEnvironment.env) {
+            if (!ignoreVars.count(i.first) && !hasPrefix(i.first, "BASH_")) {
+                if (i.second.associative)
+                    out << fmt("declare -A %s=(%s)\n", i.first, i.second.quoted);
+                else {
+                    out << fmt("%s=%s\n", i.first, i.second.quoted);
+                    if (i.second.exported)
+                        out << fmt("export %s\n", i.first);
+                }
+            }
+        }

        out << "PATH=\"$PATH:$nix_saved_PATH\"\n";

+        out << buildEnvironment.bashFunctions << "\n";
+
        out << "export NIX_BUILD_TOP=\"$(mktemp -d -t nix-shell.XXXXXX)\"\n";
        for (auto & i : {"TMP", "TMPDIR", "TEMP", "TEMPDIR"})
            out << fmt("export %s=\"$NIX_BUILD_TOP\"\n", i);
@@ -290,16 +258,16 @@ struct Common : InstallableCommand, MixProfile
        auto script = out.str();

        /* Substitute occurrences of output paths. */
-        auto outputs = buildEnvironment.vars.find("outputs");
-        assert(outputs != buildEnvironment.vars.end());
+        auto outputs = buildEnvironment.env.find("outputs");
+        assert(outputs != buildEnvironment.env.end());

        // FIXME: properly unquote 'outputs'.
        StringMap rewrites;
-        for (auto & outputName : BuildEnvironment::getStrings(outputs->second)) {
-            auto from = buildEnvironment.vars.find(outputName);
-            assert(from != buildEnvironment.vars.end());
+        for (auto & outputName : tokenizeString<std::vector<std::string>>(replaceStrings(outputs->second.quoted, "'", ""))) {
+            auto from = buildEnvironment.env.find(outputName);
+            assert(from != buildEnvironment.env.end());
            // FIXME: unquote
-            rewrites.insert({BuildEnvironment::getString(from->second), outputsDir + "/" + outputName});
+            rewrites.insert({from->second.quoted, outputsDir + "/" + outputName});
        }

        /* Substitute redirects. */
@@ -326,12 +294,6 @@ struct Common : InstallableCommand, MixProfile
    {
        return {"devShell." + settings.thisSystem.get(), "defaultPackage." + settings.thisSystem.get()};
    }
-    Strings getDefaultFlakeAttrPathPrefixes() override
-    {
-        auto res = SourceExprCommand::getDefaultFlakeAttrPathPrefixes();
-        res.emplace_front("devShells." + settings.thisSystem.get());
-        return res;
-    }

    StorePath getShellOutPath(ref<Store> store)
    {
@@ -359,9 +321,7 @@ struct Common : InstallableCommand, MixProfile

        updateProfile(shellOutPath);

-        debug("reading environment file '%s'", strPath);
-
-        return {BuildEnvironment::fromJSON(readFile(strPath)), strPath};
+        return {readEnvironment(strPath), strPath};
    }
 };

@@ -483,17 +443,13 @@ struct CmdDevelop : Common, MixEnvironment
        try {
            auto state = getEvalState();

-            auto nixpkgsLockFlags = lockFlags;
-            nixpkgsLockFlags.inputOverrides = {};
-            nixpkgsLockFlags.inputUpdates = {};
-
            auto bashInstallable = std::make_shared<InstallableFlake>(
                this,
                state,
                installable->nixpkgsFlakeRef(),
                Strings{"bashInteractive"},
                Strings{"legacyPackages." + settings.thisSystem.get() + "."},
-                nixpkgsLockFlags);
+                lockFlags);

            shell = state->store->printStorePath(
                toStorePath(state->store, Realise::Outputs, OperateOn::Output, bashInstallable)) + "/bin/bash";
@@ -514,7 +470,7 @@ struct CmdDevelop : Common, MixEnvironment
    }
 };

-struct CmdPrintDevEnv : Common, MixJSON
+struct CmdPrintDevEnv : Common
 {
    std::string description() override
    {
@@ -536,10 +492,7 @@ struct CmdPrintDevEnv : Common, MixJSON

        stopProgressBar();

-        logger->writeToStdout(
-            json
-            ? buildEnvironment.toJSON()
-            : makeRcScript(store, buildEnvironment));
+        std::cout << makeRcScript(store, buildEnvironment);
    }
 };

--- a/src/nix/develop.md
+++ b/src/nix/develop.md
@@ -84,20 +84,11 @@ the flake's `nixConfig` attribute.

 # Flake output attributes

-If no flake output attribute is given, `nix develop` tries the following
+If no flake output attribute is given, `nix run` tries the following
 flake output attributes:

 * `devShell.<system>`

 * `defaultPackage.<system>`

-If a flake output *name* is given, `nix develop` tries the following flake
-output attributes:
-
-* `devShells.<system>.<name>`
-
-* `packages.<system>.<name>`
-
-* `legacyPackages.<system>.<name>`
-
 )""
--- a/src/nix/edit.cc
+++ b/src/nix/edit.cc
@@ -31,7 +31,7 @@ struct CmdEdit : InstallableCommand
        auto [v, pos] = installable->toValue(*state);

        try {
-            pos = findPackageFilename(*state, *v, installable->what());
+            pos = findDerivationFilename(*state, *v, installable->what());
        } catch (NoPositionInfo &) {
        }

--- a/src/nix/flake-check.md
+++ b/src/nix/flake-check.md
@@ -33,7 +33,6 @@ The following flake output attributes must be derivations:
 * `checks.`*system*`.`*name*
 * `defaultPackage.`*system*`
 * `devShell.`*system*`
-* `devShells.`*system*`.`*name*`
 * `nixosConfigurations.`*name*`.config.system.build.toplevel
 * `packages.`*system*`.`*name*

--- a/src/nix/flake.cc
+++ b/src/nix/flake.cc
@@ -84,7 +84,6 @@ struct CmdFlakeUpdate : FlakeCommand

        lockFlags.recreateLockFile = true;
        lockFlags.writeLockFile = true;
-        lockFlags.applyNixConfig = true;

        lockFlake();
    }
@@ -115,7 +114,6 @@ struct CmdFlakeLock : FlakeCommand
        settings.tarballTtl = 0;

        lockFlags.writeLockFile = true;
-        lockFlags.applyNixConfig = true;

        lockFlake();
    }
@@ -272,8 +270,6 @@ struct CmdFlakeCheck : FlakeCommand
        settings.readOnlyMode = !build;

        auto state = getEvalState();
-
-        lockFlags.applyNixConfig = true;
        auto flake = lockFlake();

        bool hasErrors = false;
@@ -486,7 +482,7 @@ struct CmdFlakeCheck : FlakeCommand
                            }
                        }

-                        else if (name == "packages" || name == "devShells") {
+                        else if (name == "packages") {
                            state->forceAttrs(vOutput, pos);
                            for (auto & attr : *vOutput.attrs) {
                                checkSystemName(attr.name, *attr.pos);
@@ -914,7 +910,6 @@ struct CmdFlakeShow : FlakeCommand
                    logger->cout("%s: %s '%s'",
                        headerPrefix,
                        attrPath.size() == 2 && attrPath[0] == "devShell" ? "development environment" :
-                        attrPath.size() >= 2 && attrPath[0] == "devShells" ? "development environment" :
                        attrPath.size() == 3 && attrPath[0] == "checks" ? "derivation" :
                        attrPath.size() >= 1 && attrPath[0] == "hydraJobs" ? "derivation" :
                        "package",
@@ -933,7 +928,6 @@ struct CmdFlakeShow : FlakeCommand
                    || ((attrPath.size() == 1 || attrPath.size() == 2)
                        && (attrPath[0] == "checks"
                            || attrPath[0] == "packages"
-                            || attrPath[0] == "devShells"
                            || attrPath[0] == "apps"))
                    )
                {
@@ -942,7 +936,7 @@ struct CmdFlakeShow : FlakeCommand

                else if (
                    (attrPath.size() == 2 && (attrPath[0] == "defaultPackage" || attrPath[0] == "devShell"))
-                    || (attrPath.size() == 3 && (attrPath[0] == "checks" || attrPath[0] == "packages" || attrPath[0] == "devShells"))
+                    || (attrPath.size() == 3 && (attrPath[0] == "checks" || attrPath[0] == "packages"))
                    )
                {
                    if (visitor.isDerivation())
--- a/src/nix/get-env.sh
+++ b/src/nix/get-env.sh
@@ -8,123 +8,12 @@ if [[ -n $stdenv ]]; then
    source $stdenv/setup
 fi

-# Better to use compgen, but stdenv bash doesn't have it.
-__vars="$(declare -p)"
-__functions="$(declare -F)"
-
-__dumpEnv() {
-    printf '{\n'
-
-    printf '  "bashFunctions": {\n'
-    local __first=1
-    while read __line; do
-        if ! [[ $__line =~ ^declare\ -f\ (.*) ]]; then continue; fi
-        __fun_name="${BASH_REMATCH[1]}"
-        __fun_body="$(type $__fun_name)"
-        if [[ $__fun_body =~ \{(.*)\} ]]; then
-            if [[ -z $__first ]]; then printf ',\n'; else __first=; fi
-            __fun_body="${BASH_REMATCH[1]}"
-            printf "    "
-            __escapeString "$__fun_name"
-            printf ':'
-            __escapeString "$__fun_body"
-        else
-            printf "Cannot parse definition of function '%s'.\n" "$__fun_name" >&2
-            return 1
-        fi
-    done < <(printf "%s\n" "$__functions")
-    printf '\n  },\n'
-
-    printf '  "variables": {\n'
-    local __first=1
-    while read __line; do
-        if ! [[ $__line =~ ^declare\ (-[^ ])\ ([^=]*) ]]; then continue; fi
-        local type="${BASH_REMATCH[1]}"
-        local __var_name="${BASH_REMATCH[2]}"
-
-        if [[ $__var_name =~ ^BASH_ || \
-              $__var_name = _ || \
-              $__var_name = DIRSTACK || \
-              $__var_name = EUID || \
-              $__var_name = FUNCNAME || \
-              $__var_name = HISTCMD || \
-              $__var_name = HOSTNAME || \
-              $__var_name = GROUPS || \
-              $__var_name = PIPESTATUS || \
-              $__var_name = PWD || \
-              $__var_name = RANDOM || \
-              $__var_name = SHLVL || \
-              $__var_name = SECONDS \
-            ]]; then continue; fi
-
-        if [[ -z $__first ]]; then printf ',\n'; else __first=; fi
-
-        printf "    "
-        __escapeString "$__var_name"
-        printf ': {'
-
-        # FIXME: handle -i, -r, -n.
-        if [[ $type == -x ]]; then
-            printf '"type": "exported", "value": '
-            __escapeString "${!__var_name}"
-        elif [[ $type == -- ]]; then
-            printf '"type": "var", "value": '
-            __escapeString "${!__var_name}"
-        elif [[ $type == -a ]]; then
-            printf '"type": "array", "value": ['
-            local __first2=1
-            __var_name="$__var_name[@]"
-            for __i in "${!__var_name}"; do
-                if [[ -z $__first2 ]]; then printf ', '; else __first2=; fi
-                __escapeString "$__i"
-                printf ' '
-            done
-            printf ']'
-        elif [[ $type == -A ]]; then
-            printf '"type": "associative", "value": {\n'
-            local __first2=1
-            declare -n __var_name2="$__var_name"
-            for __i in "${!__var_name2[@]}"; do
-                if [[ -z $__first2 ]]; then printf ',\n'; else __first2=; fi
-                printf "      "
-                __escapeString "$__i"
-                printf ": "
-                __escapeString "${__var_name2[$__i]}"
-            done
-            printf '\n    }'
-        else
-            printf '"type": "unknown"'
-        fi
-
-        printf "}"
-    done < <(printf "%s\n" "$__vars")
-    printf '\n  }\n}'
-}
-
-__escapeString() {
-    local __s="$1"
-    __s="${__s//\\/\\\\}"
-    __s="${__s//\"/\\\"}"
-    __s="${__s//$'\n'/\\n}"
-    __s="${__s//$'\r'/\\r}"
-    __s="${__s//$'\t'/\\t}"
-    printf '"%s"' "$__s"
-}
-
-# In case of `__structuredAttrs = true;` the list of outputs is an associative
-# array with a format like `outname => /nix/store/hash-drvname-outname`, so `__olist`
-# must contain the array's keys (hence `${!...[@]}`) in this case.
-if [ -e .attrs.sh ]; then
-    __olist="${!outputs[@]}"
-else
-    __olist=$outputs
-fi
-
-for __output in $__olist; do
+for __output in $outputs; do
    if [[ -z $__done ]]; then
-        __dumpEnv > ${!__output}
+        export > ${!__output}
+        set >> ${!__output}
        __done=1
    else
-        echo -n >> "${!__output}"
+        echo -n >> ${!__output}
    fi
 done
--- a/src/nix/prefetch.cc
+++ b/src/nix/prefetch.cc
@@ -283,6 +283,8 @@ struct CmdStorePrefetchFile : StoreCommand, MixJSON
        expectArg("url", &url);
    }

+    Category category() override { return catUtility; }
+
    std::string description() override
    {
        return "download a file into the Nix store";
--- a/src/nix/print-dev-env.md
+++ b/src/nix/print-dev-env.md
@@ -8,43 +8,12 @@ R""(
  # . <(nix print-dev-env nixpkgs#hello)
  ```

-* Get the build environment in JSON format:
-
-  ```console
-  # nix print-dev-env nixpkgs#hello --json
-  ```
-
-  The output will look like this:
-
-  ```json
-  {
-    "bashFunctions": {
-      "buildPhase": " \n    runHook preBuild;\n...",
-      ...
-    },
-    "variables": {
-      "src": {
-        "type": "exported",
-        "value": "/nix/store/3x7dwzq014bblazs7kq20p9hyzz0qh8g-hello-2.10.tar.gz"
-      },
-      "postUnpackHooks": {
-        "type": "array",
-        "value": ["_updateSourceDateEpochFromSourceRoot"]
-      },
-      ...
-    }
-  }
-  ```
-
 # Description

-This command prints a shell script that can be sourced by `bash` and
-that sets the variables and shell functions defined by the build
-process of *installable*. This allows you to get a similar build
+This command prints a shell script that can be sourced by `b`ash and
+that sets the environment variables and shell functions defined by the
+build process of *installable*. This allows you to get a similar build
 environment in your current shell rather than in a subshell (as with
 `nix develop`).

-With `--json`, the output is a JSON serialisation of the variables and
-functions defined by the build process.
-
 )""
--- a/src/nix/registry-add.md
+++ b/src/nix/registry-add.md
@@ -21,13 +21,6 @@ R""(
  # nix registry add nixpkgs/nixos-20.03 ~/Dev/nixpkgs
  ```

-* Add `nixpkgs` pointing to `github:nixos/nixpkgs` to your custom flake
-  registry:
-
-  ```console
-  nix registry add --registry ./custom-flake-registry.json nixpkgs github:nixos/nixpkgs
-  ```
-
 # Description

 This command adds an entry to the user registry that maps flake
--- a/src/nix/registry-pin.md
+++ b/src/nix/registry-pin.md
@@ -24,13 +24,6 @@ R""(
  …
  ```

-* Pin `nixpkgs` in a custom registry to its most recent Git revision:
-
-  ```console
-  # nix registry pin --registry ./custom-flake-registry.json nixpkgs
-  ```
-
-
 # Description

 This command adds an entry to the user registry that maps flake
--- a/src/nix/registry-remove.md
+++ b/src/nix/registry-remove.md
@@ -8,12 +8,6 @@ R""(
  # nix registry remove nixpkgs
  ```

-* Remove the entry `nixpkgs` from a custom registry:
-
-  ```console
-  # nix registry remove --registry ./custom-flake-registry.json nixpkgs
-  ```
-
 # Description

 This command removes from the user registry any entry for flake
--- a/src/nix/registry.cc
+++ b/src/nix/registry.cc
@@ -10,46 +10,6 @@
 using namespace nix;
 using namespace nix::flake;

-
-class RegistryCommand : virtual Args
-{
-    std::string registry_path;
-
-    std::shared_ptr<fetchers::Registry> registry;
-
-public:
-
-    RegistryCommand()
-    {
-        addFlag({
-            .longName = "registry",
-            .description = "The registry to operate on.",
-            .labels = {"registry"},
-            .handler = {&registry_path},
-        });
-    }
-
-    std::shared_ptr<fetchers::Registry> getRegistry()
-    {
-        if (registry) return registry;
-        if (registry_path.empty()) {
-            registry = fetchers::getUserRegistry();
-        } else {
-            registry = fetchers::getCustomRegistry(registry_path);
-        }
-        return registry;
-    }
-
-    Path getRegistryPath()
-    {
-        if (registry_path.empty()) {
-            return fetchers::getUserRegistryPath();
-        } else {
-            return registry_path;
-        }
-    }
-};
-
 struct CmdRegistryList : StoreCommand
 {
    std::string description() override
@@ -85,7 +45,7 @@ struct CmdRegistryList : StoreCommand
    }
 };

-struct CmdRegistryAdd : MixEvalArgs, Command, RegistryCommand
+struct CmdRegistryAdd : MixEvalArgs, Command
 {
    std::string fromUrl, toUrl;

@@ -111,16 +71,16 @@ struct CmdRegistryAdd : MixEvalArgs, Command, RegistryCommand
    {
        auto fromRef = parseFlakeRef(fromUrl);
        auto toRef = parseFlakeRef(toUrl);
-        auto registry = getRegistry();
        fetchers::Attrs extraAttrs;
        if (toRef.subdir != "") extraAttrs["dir"] = toRef.subdir;
-        registry->remove(fromRef.input);
-        registry->add(fromRef.input, toRef.input, extraAttrs);
-        registry->write(getRegistryPath());
+        auto userRegistry = fetchers::getUserRegistry();
+        userRegistry->remove(fromRef.input);
+        userRegistry->add(fromRef.input, toRef.input, extraAttrs);
+        userRegistry->write(fetchers::getUserRegistryPath());
    }
 };

-struct CmdRegistryRemove : RegistryCommand, Command
+struct CmdRegistryRemove : virtual Args, MixEvalArgs, Command
 {
    std::string url;

@@ -143,21 +103,19 @@ struct CmdRegistryRemove : RegistryCommand, Command

    void run() override
    {
-        auto registry = getRegistry();
-        registry->remove(parseFlakeRef(url).input);
-        registry->write(getRegistryPath());
+        auto userRegistry = fetchers::getUserRegistry();
+        userRegistry->remove(parseFlakeRef(url).input);
+        userRegistry->write(fetchers::getUserRegistryPath());
    }
 };

-struct CmdRegistryPin : RegistryCommand, EvalCommand
+struct CmdRegistryPin : virtual Args, EvalCommand
 {
    std::string url;

-    std::string locked;
-
    std::string description() override
    {
-        return "pin a flake to its current version or to the current version of a flake URL";
+        return "pin a flake to its current version in user flake registry";
    }

    std::string doc() override
@@ -170,31 +128,18 @@ struct CmdRegistryPin : RegistryCommand, EvalCommand
    CmdRegistryPin()
    {
        expectArg("url", &url);
-
-        expectArgs({
-            .label = "locked",
-            .optional = true,
-            .handler = {&locked},
-            .completer = {[&](size_t, std::string_view prefix) {
-                completeFlakeRef(getStore(), prefix);
-            }}
-        });
    }

    void run(nix::ref<nix::Store> store) override
    {
-        if (locked.empty()) {
-            locked = url;
-        }
-        auto registry = getRegistry();
        auto ref = parseFlakeRef(url);
-        auto locked_ref = parseFlakeRef(locked);
-        registry->remove(ref.input);
-        auto [tree, resolved] = locked_ref.resolve(store).input.fetch(store);
+        auto userRegistry = fetchers::getUserRegistry();
+        userRegistry->remove(ref.input);
+        auto [tree, resolved] = ref.resolve(store).input.fetch(store);
        fetchers::Attrs extraAttrs;
        if (ref.subdir != "") extraAttrs["dir"] = ref.subdir;
-        registry->add(ref.input, resolved, extraAttrs);
-        registry->write(getRegistryPath());
+        userRegistry->add(ref.input, resolved, extraAttrs);
+        userRegistry->write(fetchers::getUserRegistryPath());
    }
 };

--- a/src/nix/repl.cc
+++ b/src/nix/repl.cc
@@ -68,7 +68,6 @@ struct NixRepl
    StorePath getDerivationPath(Value & v);
    bool processLine(string line);
    void loadFile(const Path & path);
-    void loadFlake(const std::string & flakeRef);
    void initEnv();
    void reloadFiles();
    void addAttrsToScope(Value & attrs);
@@ -105,23 +104,6 @@ NixRepl::~NixRepl()
    write_history(historyFile.c_str());
 }

-string runNix(Path program, const Strings & args,
-    const std::optional<std::string> & input = {})
-{
-    auto subprocessEnv = getEnv();
-    subprocessEnv["NIX_CONFIG"] = globalConfig.toKeyValue();
-    RunOptions opts(settings.nixBinDir+ "/" + program, args);
-    opts.input = input;
-    opts.environment = subprocessEnv;
-
-    auto res = runProgram(opts);
-
-    if (!statusOk(res.first))
-        throw ExecError(res.first, fmt("program '%1%' %2%", program, statusToString(res.first)));
-
-    return res.second;
-}
-
 static NixRepl * curRepl; // ugly

 static char * completionCallback(char * s, int *match) {
@@ -413,10 +395,9 @@ bool NixRepl::processLine(string line)
             << "  <x> = <expr>  Bind expression to variable\n"
             << "  :a <expr>     Add attributes from resulting set to scope\n"
             << "  :b <expr>     Build derivation\n"
-             << "  :e <expr>     Open package or function in $EDITOR\n"
+             << "  :e <expr>     Open the derivation in $EDITOR\n"
             << "  :i <expr>     Build derivation, then install result into current profile\n"
             << "  :l <path>     Load Nix expression and add it to scope\n"
-             << "  :lf <ref>     Load Nix flake and add it to scope\n"
             << "  :p <expr>     Evaluate and print expression recursively\n"
             << "  :q            Exit nix-repl\n"
             << "  :r            Reload all files\n"
@@ -437,10 +418,6 @@ bool NixRepl::processLine(string line)
        loadFile(arg);
    }

-    else if (command == ":lf" || command == ":load-flake") {
-        loadFlake(arg);
-    }
-
    else if (command == ":r" || command == ":reload") {
        state->resetFileCache();
        reloadFiles();
@@ -460,7 +437,7 @@ bool NixRepl::processLine(string line)
            pos = v.lambda.fun->pos;
        } else {
            // assume it's a derivation
-            pos = findPackageFilename(*state, v, arg);
+            pos = findDerivationFilename(*state, v, arg);
        }

        // Open in EDITOR
@@ -486,7 +463,7 @@ bool NixRepl::processLine(string line)
        state->callFunction(f, v, result, Pos());

        StorePath drvPath = getDerivationPath(result);
-        runNix("nix-shell", {state->store->printStorePath(drvPath)});
+        runProgram(settings.nixBinDir + "/nix-shell", true, {state->store->printStorePath(drvPath)});
    }

    else if (command == ":b" || command == ":i" || command == ":s") {
@@ -500,7 +477,7 @@ bool NixRepl::processLine(string line)
               but doing it in a child makes it easier to recover from
               problems / SIGINT. */
            try {
-                runNix("nix", {"build", "--no-link", drvPathRaw});
+                runProgram(settings.nixBinDir + "/nix", true, {"build", "--no-link", drvPathRaw});
                auto drv = state->store->readDerivation(drvPath);
                std::cout << std::endl << "this derivation produced the following outputs:" << std::endl;
                for (auto & i : drv.outputsAndOptPaths(*state->store))
@@ -508,9 +485,9 @@ bool NixRepl::processLine(string line)
            } catch (ExecError &) {
            }
        } else if (command == ":i") {
-            runNix("nix-env", {"-i", drvPathRaw});
+            runProgram(settings.nixBinDir + "/nix-env", true, {"-i", drvPathRaw});
        } else {
-            runNix("nix-shell", {drvPathRaw});
+            runProgram(settings.nixBinDir + "/nix-shell", true, {drvPathRaw});
        }
    }

@@ -582,25 +559,6 @@ void NixRepl::loadFile(const Path & path)
    addAttrsToScope(v2);
 }

-void NixRepl::loadFlake(const std::string & flakeRefS)
-{
-    auto flakeRef = parseFlakeRef(flakeRefS, absPath("."), true);
-    if (evalSettings.pureEval && !flakeRef.input.isImmutable())
-        throw Error("cannot use ':load-flake' on mutable flake reference '%s' (use --impure to override)", flakeRefS);
-
-    Value v;
-
-    flake::callFlake(*state,
-        flake::lockFlake(*state, flakeRef,
-            flake::LockFlags {
-                .updateLockFile = false,
-                .useRegistries = !evalSettings.pureEval,
-                .allowMutable  = !evalSettings.pureEval,
-            }),
-        v);
-    addAttrsToScope(v);
-}
-

 void NixRepl::initEnv()
 {
--- a/src/nix/show-config.cc
+++ b/src/nix/show-config.cc
@@ -22,7 +22,10 @@ struct CmdShowConfig : Command, MixJSON
            // FIXME: use appropriate JSON types (bool, ints, etc).
            logger->cout("%s", globalConfig.toJSON().dump());
        } else {
-            logger->cout("%s", globalConfig.toKeyValue());
+            std::map<std::string, Config::SettingInfo> settings;
+            globalConfig.getSettings(settings);
+            for (auto & s : settings)
+                logger->cout("%s = %s", s.first, s.second.value);
        }
    }
 };
--- a/src/nlohmann/json.hpp
+++ b/src/nlohmann/json.hpp
--- a/src/nlohmann/json_fwd.hpp
+++ b/src/nlohmann/json_fwd.hpp
@@ -1,78 +0,0 @@
-#ifndef INCLUDE_NLOHMANN_JSON_FWD_HPP_
-#define INCLUDE_NLOHMANN_JSON_FWD_HPP_
-
-#include <cstdint> // int64_t, uint64_t
-#include <map> // map
-#include <memory> // allocator
-#include <string> // string
-#include <vector> // vector
-
-/*!
-@brief namespace for Niels Lohmann
-@see https://github.com/nlohmann
-@since version 1.0.0
-*/
-namespace nlohmann
-{
-/*!
-@brief default JSONSerializer template argument
-
-This serializer ignores the template arguments and uses ADL
-([argument-dependent lookup](https://en.cppreference.com/w/cpp/language/adl))
-for serialization.
-*/
-template<typename T = void, typename SFINAE = void>
-struct adl_serializer;
-
-template<template<typename U, typename V, typename... Args> class ObjectType =
-         std::map,
-         template<typename U, typename... Args> class ArrayType = std::vector,
-         class StringType = std::string, class BooleanType = bool,
-         class NumberIntegerType = std::int64_t,
-         class NumberUnsignedType = std::uint64_t,
-         class NumberFloatType = double,
-         template<typename U> class AllocatorType = std::allocator,
-         template<typename T, typename SFINAE = void> class JSONSerializer =
-         adl_serializer,
-         class BinaryType = std::vector<std::uint8_t>>
-class basic_json;
-
-/*!
-@brief JSON Pointer
-
-A JSON pointer defines a string syntax for identifying a specific value
-within a JSON document. It can be used with functions `at` and
-`operator[]`. Furthermore, JSON pointers are the base for JSON patches.
-
-@sa [RFC 6901](https://tools.ietf.org/html/rfc6901)
-
-@since version 2.0.0
-*/
-template<typename BasicJsonType>
-class json_pointer;
-
-/*!
-@brief default JSON class
-
-This type is the default specialization of the @ref basic_json class which
-uses the standard template types.
-
-@since version 1.0.0
-*/
-using json = basic_json<>;
-
-template<class Key, class T, class IgnoredLess, class Allocator>
-struct ordered_map;
-
-/*!
-@brief ordered JSON class
-
-This type preserves the insertion order of object keys.
-
-@since version 3.9.0
-*/
-using ordered_json = basic_json<nlohmann::ordered_map>;
-
-}  // namespace nlohmann
-
-#endif  // INCLUDE_NLOHMANN_JSON_FWD_HPP_
--- a/src/resolve-system-dependencies/local.mk
+++ b/src/resolve-system-dependencies/local.mk
@@ -1,4 +1,4 @@
-ifdef HOST_DARWIN
+ifeq ($(OS), Darwin)
  programs += resolve-system-dependencies
 endif

--- a/tests/add.sh
+++ b/tests/add.sh
@@ -9,7 +9,7 @@ echo $path2
 if test "$path1" != "$path2"; then
    echo "nix-store --add and --add-fixed mismatch"
    exit 1
-fi
+fi    

 path3=$(nix-store --add-fixed sha256 ./dummy)
 echo $path3
--- a/tests/ca/concurrent-builds.sh
+++ b/tests/ca/concurrent-builds.sh
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-
-# Ensure that we can’t build twice the same derivation concurrently.
-# Regression test for https://github.com/NixOS/nix/issues/5029
-
-source common.sh
-
-sed -i 's/experimental-features .*/& ca-derivations ca-references/' "$NIX_CONF_DIR"/nix.conf
-
-export NIX_TESTS_CA_BY_DEFAULT=1
-
-clearStore
-
-for i in {0..5}; do
-    nix build --no-link --file ./racy.nix &
-done
-
-wait
--- a/tests/ca/racy.nix
+++ b/tests/ca/racy.nix
@@ -1,15 +0,0 @@
-# A derivation that would certainly fail if several builders tried to
-# build it at once.
-
-
-with import ./config.nix;
-
-mkDerivation {
-  name = "simple";
-  buildCommand = ''
-    mkdir $out
-    echo bar >> $out/foo
-    sleep 3
-    [[ "$(cat $out/foo)" == bar ]]
-  '';
-}
--- a/tests/check.nix
+++ b/tests/check.nix
@@ -44,7 +44,7 @@ with import ./config.nix;
  };

  hashmismatch = import <nix/fetchurl.nix> {
-    url = "file://" + builtins.getEnv "TMPDIR" + "/dummy";
+    url = "file://" + toString ./dummy;
    sha256 = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73";
  };

--- a/tests/check.sh
+++ b/tests/check.sh
@@ -74,13 +74,12 @@ nix-build check.nix -A fetchurl --no-out-link --check
 nix-build check.nix -A fetchurl --no-out-link --repair
 [[ $(cat $path) != foo ]]

-echo 'Hello World' > $TMPDIR/dummy
 nix-build check.nix -A hashmismatch --no-out-link || status=$?
 [ "$status" = "102" ]

-echo -n > $TMPDIR/dummy
+echo -n > ./dummy
 nix-build check.nix -A hashmismatch --no-out-link
-echo 'Hello World' > $TMPDIR/dummy
+echo 'Hello World' > ./dummy

 nix-build check.nix -A hashmismatch --no-out-link --check || status=$?
 [ "$status" = "102" ]
--- a/tests/dummy
+++ b/tests/dummy
@@ -1 +0,0 @@
-Hello World
--- a/tests/fetchGit.sh
+++ b/tests/fetchGit.sh
@@ -189,7 +189,3 @@ path8=$(nix eval --impure --raw --expr "(builtins.fetchGit { url = \"file://$rep
 rev4=$(git -C $repo rev-parse HEAD)
 rev4_nix=$(nix eval --impure --raw --expr "(builtins.fetchGit { url = \"file://$repo\"; ref = \"HEAD\"; }).rev")
 [[ $rev4 = $rev4_nix ]]
-
-# The name argument should be handled
-path9=$(nix eval --impure --raw --expr "(builtins.fetchGit { url = \"file://$repo\"; ref = \"HEAD\"; name = \"foo\"; }).outPath")
-[[ $path9 =~ -foo$ ]]
--- a/tests/fetchMercurial.sh
+++ b/tests/fetchMercurial.sh
@@ -94,8 +94,3 @@ hg commit --cwd $repo -m 'Bla3'

 path4=$(nix eval --impure --refresh --raw --expr "(builtins.fetchMercurial file://$repo).outPath")
 [[ $path2 = $path4 ]]
-
-echo paris > $repo/hello
-# Passing a `name` argument should be reflected in the output path
-path5=$(nix eval -vvvvv --impure --refresh --raw --expr "(builtins.fetchMercurial { url = \"file://$repo\"; name = \"foo\"; } ).outPath")
-[[ $path5 =~ -foo$ ]]
--- a/tests/flakes.sh
+++ b/tests/flakes.sh
@@ -90,14 +90,76 @@ EOF
 git -C $nonFlakeDir add README.md
 git -C $nonFlakeDir commit -m 'Initial'

-# Construct a custom registry, additionally test the --registry flag
-nix registry add --registry $registry flake1 git+file://$flake1Dir
-nix registry add --registry $registry flake2 git+file://$flake2Dir
-nix registry add --registry $registry flake3 git+file://$flake3Dir
-nix registry add --registry $registry flake4 flake3
-nix registry add --registry $registry flake5 hg+file://$flake5Dir
-nix registry add --registry $registry nixpkgs flake1
-nix registry add --registry $registry templates git+file://$templatesDir
+cat > $registry <<EOF
+{
+  "version": 2,
+  "flakes": [
+    { "from": {
+        "type": "indirect",
+        "id": "flake1"
+      },
+      "to": {
+        "type": "git",
+        "url": "file://$flake1Dir"
+      }
+    },
+    { "from": {
+        "type": "indirect",
+        "id": "flake2"
+      },
+      "to": {
+        "type": "git",
+        "url": "file://$flake2Dir"
+      }
+    },
+    { "from": {
+        "type": "indirect",
+        "id": "flake3"
+      },
+      "to": {
+        "type": "git",
+        "url": "file://$flake3Dir"
+      }
+    },
+    { "from": {
+        "type": "indirect",
+        "id": "flake4"
+      },
+      "to": {
+        "type": "indirect",
+        "id": "flake3"
+      }
+    },
+    { "from": {
+        "type": "indirect",
+        "id": "flake5"
+      },
+      "to": {
+        "type": "hg",
+        "url": "file://$flake5Dir"
+      }
+    },
+    { "from": {
+        "type": "indirect",
+        "id": "nixpkgs"
+      },
+      "to": {
+        "type": "indirect",
+        "id": "flake1"
+      }
+    },
+    { "from": {
+        "type": "indirect",
+        "id": "templates"
+      },
+      "to": {
+        "type": "git",
+        "url": "file://$templatesDir"
+      }
+    }
+  ]
+}
+EOF

 # Test 'nix flake list'.
 [[ $(nix registry list | wc -l) == 7 ]]
@@ -147,7 +209,6 @@ nix build -o $TEST_ROOT/result --expr "(builtins.getFlake \"git+file://$flake1Di

 # Building a flake with an unlocked dependency should fail in pure mode.
 (! nix build -o $TEST_ROOT/result flake2#bar --no-registries)
-(! nix build -o $TEST_ROOT/result flake2#bar --no-use-registries)
 (! nix eval --expr "builtins.getFlake \"$flake2Dir\"")

 # But should succeed in impure mode.
@@ -171,7 +232,6 @@ nix build -o $TEST_ROOT/result $flake2Dir#bar
 # Building with a lockfile should not require a fetch of the registry.
 nix build -o $TEST_ROOT/result --flake-registry file:///no-registry.json $flake2Dir#bar --refresh
 nix build -o $TEST_ROOT/result --no-registries $flake2Dir#bar --refresh
-nix build -o $TEST_ROOT/result --no-use-registries $flake2Dir#bar --refresh

 # Updating the flake should not change the lockfile.
 nix flake lock $flake2Dir
@@ -182,7 +242,6 @@ nix build -o $TEST_ROOT/result flake2#bar

 # Or without a registry.
 nix build -o $TEST_ROOT/result --no-registries git+file://$flake2Dir#bar --refresh
-nix build -o $TEST_ROOT/result --no-use-registries git+file://$flake2Dir#bar --refresh

 # Test whether indirect dependencies work.
 nix build -o $TEST_ROOT/result $flake3Dir#xyzzy
@@ -346,8 +405,6 @@ nix registry add flake1 flake3
 [[ $(nix registry list | wc -l) == 8 ]]
 nix registry pin flake1
 [[ $(nix registry list | wc -l) == 8 ]]
-nix registry pin flake1 flake3
-[[ $(nix registry list | wc -l) == 8 ]]
 nix registry remove flake1
 [[ $(nix registry list | wc -l) == 7 ]]

@@ -606,7 +663,6 @@ nix flake metadata --json hg+file://$flake5Dir
 [[ $(nix flake metadata --json hg+file://$flake5Dir | jq -e -r .revCount) = 1 ]]

 nix build -o $TEST_ROOT/result hg+file://$flake5Dir --no-registries --no-allow-dirty
-nix build -o $TEST_ROOT/result hg+file://$flake5Dir --no-use-registries --no-allow-dirty

 # Test tarball flakes
 tar cfz $TEST_ROOT/flake.tar.gz -C $TEST_ROOT --exclude .hg flake5
--- a/tests/init.sh
+++ b/tests/init.sh
@@ -35,3 +35,5 @@ nix-store --init

 # Did anything happen?
 test -e "$NIX_STATE_DIR"/db/db.sqlite
+
+echo 'Hello World' > ./dummy
--- a/tests/local.mk
+++ b/tests/local.mk
@@ -46,7 +46,6 @@ nix_tests = \
  flakes.sh \
  build.sh \
  compute-levels.sh \
-  repl.sh \
  ca/build.sh \
  ca/build-with-garbage-path.sh \
  ca/duplicate-realisation-in-closure.sh \
@@ -55,7 +54,6 @@ nix_tests = \
  ca/nix-shell.sh \
  ca/nix-run.sh \
  ca/recursive.sh \
-  ca/concurrent-builds.sh \
  ca/nix-copy.sh
  # parallel.sh

--- a/tests/nix-shell.sh
+++ b/tests/nix-shell.sh
@@ -96,11 +96,5 @@ echo foo | nix develop -f shell.nix shellDrv -c cat | grep -q foo
 nix_develop -f shell.nix shellDrv -c echo foo |& grep -q foo

 # Test 'nix print-dev-env'.
-[[ $(nix print-dev-env -f shell.nix shellDrv --json | jq -r .variables.arr1.value[2]) = '3 4' ]]
-
 source <(nix print-dev-env -f shell.nix shellDrv)
 [[ -n $stdenv ]]
-[[ ${arr1[2]} = "3 4" ]]
-[[ ${arr2[1]} = $'\n' ]]
-[[ ${arr2[2]} = $'x\ny' ]]
-[[ $(fun) = blabla ]]
--- a/tests/repl.sh
+++ b/tests/repl.sh
@@ -1,18 +0,0 @@
-source common.sh
-
-replCmds="
-simple = import ./simple.nix
-:b simple
-"
-
-testRepl () {
-    local nixArgs=("$@")
-    local outPath=$(nix repl "${nixArgs[@]}" <<< "$replCmds" |&
-        grep -o -E "$NIX_STORE_DIR/\w*-simple")
-    nix path-info "${nixArgs[@]}" "$outPath"
-}
-
-# Simple test, try building a drv
-testRepl
-# Same thing (kind-of), but with a remote store.
-testRepl --store "$TEST_ROOT/store?real=$NIX_STORE_DIR"
--- a/tests/shell.nix
+++ b/tests/shell.nix
@@ -20,20 +20,6 @@ let pkgs = rec {
    for pkg in $buildInputs; do
      export PATH=$PATH:$pkg/bin
    done
-
-    # mimic behavior of stdenv for `$out` etc. for structured attrs.
-    if [ -n "''${NIX_ATTRS_SH_FILE}" ]; then
-      for o in "''${!outputs[@]}"; do
-        eval "''${o}=''${outputs[$o]}"
-        export "''${o}"
-      done
-    fi
-
-    declare -a arr1=(1 2 "3 4" 5)
-    declare -a arr2=(x $'\n' $'x\ny')
-    fun() {
-      echo blabla
-    }
  '';

  stdenv = mkDerivation {
@@ -48,8 +34,6 @@ let pkgs = rec {
    name = "shellDrv";
    builder = "/does/not/exist";
    VAR_FROM_NIX = "bar";
-    ASCII_PERCENT = "%";
-    ASCII_AT = "@";
    TEST_inNixShell = if inNixShell then "true" else "false";
    inherit stdenv;
    outputs = ["dev" "out"];
--- a/tests/structured-attrs-shell.nix
+++ b/tests/structured-attrs-shell.nix
@@ -1,21 +0,0 @@
-with import ./config.nix;
-let
-  dep = mkDerivation {
-    name = "dep";
-    buildCommand = ''
-      mkdir $out; echo bla > $out/bla
-    '';
-  };
-  inherit (import ./shell.nix { inNixShell = true; }) stdenv;
-in
-mkDerivation {
-  name = "structured2";
-  __structuredAttrs = true;
-  inherit stdenv;
-  outputs = [ "out" "dev" ];
-  my.list = [ "a" "b" "c" ];
-  exportReferencesGraph.refs = [ dep ];
-  buildCommand = ''
-    touch ''${outputs[out]}; touch ''${outputs[dev]}
-  '';
-}
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`$(eval $(call install-file-as, $(d)/completion.fish, $(datarootdir)/fish/vendor_completions.d/nix.fish, 0644))`