Merge remote-tracking branch 'origin/master' into libgit2

.github/workflows/backport.yml

@@ -21,7 +21,7 @@ jobs:
  fetch-depth: 0
  - name: Create backport PRs
  # should be kept in sync with `version`
- uses: zeebe-io/backport-action@v2.0.0
+ uses: zeebe-io/backport-action@v2.1.0
  with:
  # Config README: https://github.com/zeebe-io/backport-action#backport-action
  github_token: ${{ secrets.GITHUB_TOKEN }}

doc/manual/src/release-notes/rl-next.md

@@ -1,5 +1,8 @@
 # Release X.Y (202?-??-??)
 
+- The experimental nix command can now act as a [shebang interpreter](@docroot@/command-ref/new-cli/nix.md#shebang-interpreter)
+ by appending the contents of any `#! nix` lines and the script's location to a single call.
+
 - [URL flake references](@docroot@/command-ref/new-cli/nix3-flake.md#flake-references) now support [percent-encoded](https://datatracker.ietf.org/doc/html/rfc3986#section-2.1) characters.
 
 - [Path-like flake references](@docroot@/command-ref/new-cli/nix3-flake.md#path-like-syntax) now accept arbitrary unicode characters (except `#` and `?`).
@@ -14,8 +17,8 @@
 
 - `nix-shell` shebang lines now support single-quoted arguments.
 
-- `builtins.fetchTree` is now marked as stable.
-
+- `builtins.fetchTree` is now its own experimental feature, [`fetch-tree`](@docroot@/contributing/experimental-features.md#xp-fetch-tree).
+ As described in the document for that feature, this is because we anticipate polishing it and then stabilizing it before the rest of Flakes.
 
 - The interface for creating and updating lock files has been overhauled:
 
@@ -29,3 +32,44 @@
 
  - The flake-specific flags `--recreate-lock-file` and `--update-input` have been removed from all commands operating on installables.
  They are superceded by `nix flake update`.
+
+- Commit signature verification for the [`builtins.fetchGit`](@docroot@/language/builtins.md#builtins-fetchGit) is added as the new [`verified-fetches` experimental feature](@docroot@/contributing/experimental-features.md#xp-feature-verified-fetches).
+
+- [`nix path-info --json`](@docroot@/command-ref/new-cli/nix3-path-info.md)
+ (experimental) now returns a JSON map rather than JSON list.
+ The `path` field of each object has instead become the key in th outer map, since it is unique.
+ The `valid` field also goes away because we just use null instead.
+
+ - Old way:
+
+ ```json5
+ [
+ {
+ "path": "/nix/store/8fv91097mbh5049i9rglc73dx6kjg3qk-bash-5.2-p15",
+ "valid": true,
+ // ...
+ },
+ {
+ "path": "/nix/store/wffw7l0alvs3iw94cbgi1gmmbmw99sqb-home-manager-path",
+ "valid": false
+ }
+ ]
+ ```
+
+ - New way
+
+ ```json5
+ {
+ "/nix/store/8fv91097mbh5049i9rglc73dx6kjg3qk-bash-5.2-p15": {
+ // ...
+ },
+ "/nix/store/wffw7l0alvs3iw94cbgi1gmmbmw99sqb-home-manager-path": null,
+ }
+ ```
+
+ This makes it match `nix derivation show`, which also maps store paths to information.
+
+- When Nix is installed using the [binary installer](@docroot@/installation/installing-binary.md), in supported shells (Bash, Zsh, Fish)
+ [`XDG_DATA_DIRS`](https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html#variables) is now populated with the path to the `/share` subdirectory of the current profile.
+ This means that command completion scripts, `.desktop` files, and similar artifacts installed via [`nix-env`](@docroot@/command-ref/nix-env.md) or [`nix profile`](@docroot@/command-ref/new-cli/nix3-profile.md)
+ (experimental) can be found by any program that follows the [XDG Base Directory Specification](https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html).

flake.nix

@@ -185,6 +185,7 @@
  buildPackages.git
  buildPackages.mercurial # FIXME: remove? only needed for tests
  buildPackages.jq # Also for custom mdBook preprocessor.
+ buildPackages.openssh # only needed for tests (ssh-keygen)
  ]
  ++ lib.optionals stdenv.hostPlatform.isLinux [(buildPackages.util-linuxMinimal or buildPackages.utillinuxMinimal)];
 

maintainers/README.md

@@ -2,7 +2,7 @@
 
 ## Motivation
 
-The team's main responsibility is to set a direction for the development of Nix and ensure that the code is in good shape.
+The team's main responsibility is to guide and direct the development of Nix and ensure that the code is in good shape.
 
 We aim to achieve this by improving the contributor experience and attracting more maintainers – that is, by helping other people contributing to Nix and eventually taking responsibility – in order to scale the development process to match users' needs.
 

perl/lib/Nix/Store.xs

@@ -11,7 +11,6 @@
 #include "derivations.hh"
 #include "globals.hh"
 #include "store-api.hh"
-#include "util.hh"
 #include "crypto.hh"
 
 #include <sodium.h>

scripts/nix-profile-daemon.fish.in

@@ -19,6 +19,14 @@ set __ETC_PROFILE_NIX_SOURCED 1
 
 set --export NIX_PROFILES "@localstatedir@/nix/profiles/default $HOME/.nix-profile"
 
+# Populate bash completions, .desktop files, etc
+if test -z "$XDG_DATA_DIRS"
+ # According to XDG spec the default is /usr/local/share:/usr/share, don't set something that prevents that default
+ set --export XDG_DATA_DIRS "/usr/local/share:/usr/share:/nix/var/nix/profiles/default/share"
+else
+ set --export XDG_DATA_DIRS "$XDG_DATA_DIRS:/nix/var/nix/profiles/default/share"
+end
+
 # Set $NIX_SSL_CERT_FILE so that Nixpkgs applications like curl work.
 if test -n "$NIX_SSH_CERT_FILE"
  : # Allow users to override the NIX_SSL_CERT_FILE

scripts/nix-profile-daemon.sh.in

@@ -30,6 +30,14 @@ fi
 
 export NIX_PROFILES="@localstatedir@/nix/profiles/default $NIX_LINK"
 
+# Populate bash completions, .desktop files, etc
+if [ -z "$XDG_DATA_DIRS" ]; then
+ # According to XDG spec the default is /usr/local/share:/usr/share, don't set something that prevents that default
+ export XDG_DATA_DIRS="/usr/local/share:/usr/share:$NIX_LINK/share:/nix/var/nix/profiles/default/share"
+else
+ export XDG_DATA_DIRS="$XDG_DATA_DIRS:$NIX_LINK/share:/nix/var/nix/profiles/default/share"
+fi
+
 # Set $NIX_SSL_CERT_FILE so that Nixpkgs applications like curl work.
 if [ -n "${NIX_SSL_CERT_FILE:-}" ]; then
  : # Allow users to override the NIX_SSL_CERT_FILE

scripts/nix-profile.fish.in

@@ -20,6 +20,14 @@ if test -n "$HOME" && test -n "$USER"
  # This part should be kept in sync with nixpkgs:nixos/modules/programs/environment.nix
  set --export NIX_PROFILES "@localstatedir@/nix/profiles/default $HOME/.nix-profile"
 
+ # Populate bash completions, .desktop files, etc
+ if test -z "$XDG_DATA_DIRS"
+ # According to XDG spec the default is /usr/local/share:/usr/share, don't set something that prevents that default
+ set --export XDG_DATA_DIRS "/usr/local/share:/usr/share:$NIX_LINK/share:/nix/var/nix/profiles/default/share"
+ else
+ set --export XDG_DATA_DIRS "$XDG_DATA_DIRS:$NIX_LINK/share:/nix/var/nix/profiles/default/share"
+ end
+
  # Set $NIX_SSL_CERT_FILE so that Nixpkgs applications like curl work.
  if test -n "$NIX_SSH_CERT_FILE"
  : # Allow users to override the NIX_SSL_CERT_FILE

scripts/nix-profile.sh.in

@@ -32,6 +32,14 @@ if [ -n "$HOME" ] && [ -n "$USER" ]; then
  # This part should be kept in sync with nixpkgs:nixos/modules/programs/environment.nix
  export NIX_PROFILES="@localstatedir@/nix/profiles/default $NIX_LINK"
 
+ # Populate bash completions, .desktop files, etc
+ if [ -z "$XDG_DATA_DIRS" ]; then
+ # According to XDG spec the default is /usr/local/share:/usr/share, don't set something that prevents that default
+ export XDG_DATA_DIRS="/usr/local/share:/usr/share:$NIX_LINK/share:/nix/var/nix/profiles/default/share"
+ else
+ export XDG_DATA_DIRS="$XDG_DATA_DIRS:$NIX_LINK/share:/nix/var/nix/profiles/default/share"
+ fi
+
  # Set $NIX_SSL_CERT_FILE so that Nixpkgs applications like curl work.
  if [ -e /etc/ssl/certs/ca-certificates.crt ]; then # NixOS, Ubuntu, Debian, Gentoo, Arch
  export NIX_SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt

src/libcmd/built-path.hh

@@ -1,3 +1,6 @@
+#pragma once
+///@file
+
 #include "derived-path.hh"
 #include "realisation.hh"
 

src/libcmd/command.cc

@@ -175,7 +175,7 @@ void BuiltPathsCommand::run(ref<Store> store, Installables && installables)
  throw UsageError("'--all' does not expect arguments");
  // XXX: Only uses opaque paths, ignores all the realisations
  for (auto & p : store->queryAllValidPaths())
- paths.push_back(BuiltPath::Opaque{p});
+ paths.emplace_back(BuiltPath::Opaque{p});
  } else {
  paths = Installable::toBuiltPaths(getEvalStore(), store, realiseMode, operateOn, installables);
  if (recursive) {
@@ -188,7 +188,7 @@ void BuiltPathsCommand::run(ref<Store> store, Installables && installables)
  }
  store->computeFSClosure(pathsRoots, pathsClosure);
  for (auto & path : pathsClosure)
- paths.push_back(BuiltPath::Opaque{path});
+ paths.emplace_back(BuiltPath::Opaque{path});
  }
  }
 

src/libcmd/common-eval-args.cc

@@ -2,7 +2,6 @@
 #include "common-eval-args.hh"
 #include "shared.hh"
 #include "filetransfer.hh"
-#include "util.hh"
 #include "eval.hh"
 #include "fetchers.hh"
 #include "registry.hh"
@@ -165,7 +164,7 @@ Bindings * MixEvalArgs::getAutoArgs(EvalState & state)
  return res.finish();
 }
 
-SourcePath lookupFileArg(EvalState & state, std::string_view s)
+SourcePath lookupFileArg(EvalState & state, std::string_view s, CanonPath baseDir)
 {
  if (EvalSettings::isPseudoUrl(s)) {
  auto storePath = fetchers::downloadTarball(
@@ -186,7 +185,7 @@ SourcePath lookupFileArg(EvalState & state, std::string_view s)
  }
 
  else
- return state.rootPath(CanonPath::fromCwd(s));
+ return state.rootPath(CanonPath(s, baseDir));
 }
 
 }

src/libcmd/common-eval-args.hh

@@ -2,6 +2,7 @@
 ///@file
 
 #include "args.hh"
+#include "canon-path.hh"
 #include "common-args.hh"
 #include "search-path.hh"
 
@@ -28,6 +29,6 @@ private:
  std::map<std::string, std::string> autoArgs;
 };
 
-SourcePath lookupFileArg(EvalState & state, std::string_view s);
+SourcePath lookupFileArg(EvalState & state, std::string_view s, CanonPath baseDir = CanonPath::fromCwd());
 
 }

src/libcmd/editor-for.cc

@@ -1,5 +1,5 @@
-#include "util.hh"
 #include "editor-for.hh"
+#include "environment-variables.hh"
 
 namespace nix {
 

src/libcmd/installable-attr-path.hh

@@ -4,7 +4,6 @@
 #include "globals.hh"
 #include "installable-value.hh"
 #include "outputs-spec.hh"
-#include "util.hh"
 #include "command.hh"
 #include "attr-path.hh"
 #include "common-eval-args.hh"

src/libcmd/installables.cc

@@ -4,6 +4,7 @@
 #include "installable-attr-path.hh"
 #include "installable-flake.hh"
 #include "outputs-spec.hh"
+#include "users.hh"
 #include "util.hh"
 #include "command.hh"
 #include "attr-path.hh"
@@ -87,7 +88,7 @@ MixFlakeOptions::MixFlakeOptions()
  lockFlags.writeLockFile = false;
  lockFlags.inputOverrides.insert_or_assign(
  flake::parseInputPath(inputPath),
- parseFlakeRef(flakeRef, absPath("."), true));
+ parseFlakeRef(flakeRef, absPath(getCommandBaseDir()), true));
  }},
  .completer = {[&](AddCompletions & completions, size_t n, std::string_view prefix) {
  if (n == 0) {
@@ -129,7 +130,7 @@ MixFlakeOptions::MixFlakeOptions()
  auto evalState = getEvalState();
  auto flake = flake::lockFlake(
  *evalState,
- parseFlakeRef(flakeRef, absPath(".")),
+ parseFlakeRef(flakeRef, absPath(getCommandBaseDir())),
  { .writeLockFile = false });
  for (auto & [inputName, input] : flake.lockFile.root->inputs) {
  auto input2 = flake.lockFile.findInput({inputName}); // resolve 'follows' nodes
@@ -293,6 +294,8 @@ void completeFlakeRefWithFragment(
  prefixRoot = ".";
  }
  auto flakeRefS = std::string(prefix.substr(0, hash));
+
+ // TODO: ideally this would use the command base directory instead of assuming ".".
  auto flakeRef = parseFlakeRef(expandTilde(flakeRefS), absPath("."));
 
  auto evalCache = openEvalCache(*evalState,
@@ -441,10 +444,12 @@ Installables SourceExprCommand::parseInstallables(
  auto e = state->parseStdin();
  state->eval(e, *vFile);
  }
- else if (file)
- state->evalFile(lookupFileArg(*state, *file), *vFile);
+ else if (file) {
+ state->evalFile(lookupFileArg(*state, *file, CanonPath::fromCwd(getCommandBaseDir())), *vFile);
+ }
  else {
- auto e = state->parseExprFromString(*expr, state->rootPath(CanonPath::fromCwd()));
+ CanonPath dir(CanonPath::fromCwd(getCommandBaseDir()));
+ auto e = state->parseExprFromString(*expr, state->rootPath(dir));
  state->eval(e, *vFile);
  }
 
@@ -479,7 +484,7 @@ Installables SourceExprCommand::parseInstallables(
  }
 
  try {
- auto [flakeRef, fragment] = parseFlakeRefWithFragment(std::string { prefix }, absPath("."));
+ auto [flakeRef, fragment] = parseFlakeRefWithFragment(std::string { prefix }, absPath(getCommandBaseDir()));
  result.push_back(make_ref<InstallableFlake>(
  this,
  getEvalState(),
@@ -663,7 +668,7 @@ BuiltPaths Installable::toBuiltPaths(
 
  BuiltPaths res;
  for (auto & drvPath : Installable::toDerivations(store, installables, true))
- res.push_back(BuiltPath::Opaque{drvPath});
+ res.emplace_back(BuiltPath::Opaque{drvPath});
  return res;
  }
 }
@@ -753,7 +758,7 @@ std::vector<FlakeRef> RawInstallablesCommand::getFlakeRefsForCompletion()
  for (auto i : rawInstallables)
  res.push_back(parseFlakeRefWithFragment(
  expandTilde(i),
- absPath(".")).first);
+ absPath(getCommandBaseDir())).first);
  return res;
 }
 
@@ -775,7 +780,7 @@ std::vector<FlakeRef> InstallableCommand::getFlakeRefsForCompletion()
  return {
  parseFlakeRefWithFragment(
  expandTilde(_installable),
- absPath(".")).first
+ absPath(getCommandBaseDir())).first
  };
 }
 

src/libcmd/installables.hh

@@ -1,7 +1,6 @@
 #pragma once
 ///@file
 
-#include "util.hh"
 #include "path.hh"
 #include "outputs-spec.hh"
 #include "derived-path.hh"

src/libcmd/markdown.cc

@@ -1,6 +1,7 @@
 #include "markdown.hh"
 #include "util.hh"
 #include "finally.hh"
+#include "terminal.hh"
 
 #include <sys/queue.h>
 #include <lowdown.h>

src/libcmd/repl.cc

@@ -22,6 +22,7 @@ extern "C" {
 #include "repl.hh"
 
 #include "ansicolor.hh"
+#include "signals.hh"
 #include "shared.hh"
 #include "eval.hh"
 #include "eval-cache.hh"
@@ -36,6 +37,8 @@ extern "C" {
 #include "globals.hh"
 #include "flake/flake.hh"
 #include "flake/lockfile.hh"
+#include "users.hh"
+#include "terminal.hh"
 #include "editor-for.hh"
 #include "finally.hh"
 #include "markdown.hh"

src/libexpr/attr-path.cc

@@ -1,6 +1,5 @@
 #include "attr-path.hh"
 #include "eval-inline.hh"
-#include "util.hh"
 
 
 namespace nix {

src/libexpr/eval-cache.cc

@@ -1,3 +1,4 @@
+#include "users.hh"
 #include "eval-cache.hh"
 #include "sqlite.hh"
 #include "eval.hh"

src/libexpr/eval-settings.cc

@@ -1,3 +1,4 @@
+#include "users.hh"
 #include "globals.hh"
 #include "profiles.hh"
 #include "eval.hh"

src/libexpr/eval-settings.hh

@@ -1,4 +1,6 @@
 #pragma once
+///@file
+
 #include "config.hh"
 
 namespace nix {

src/libexpr/eval.cc

@@ -14,6 +14,7 @@
 #include "print.hh"
 #include "fs-input-accessor.hh"
 #include "memory-input-accessor.hh"
+#include "signals.hh"
 
 #include <algorithm>
 #include <chrono>