From 203ef26974d5edf9e67bce6153407414be42cf91 Mon Sep 17 00:00:00 2001 From: "lincoln auster [they/them]" Date: Tue, 25 Jan 2022 11:59:51 -0700 Subject: [PATCH 1/2] flakes: document nixConfig option Fixes #5988. --- src/nix/flake.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/nix/flake.md b/src/nix/flake.md index a8436bcaa..db6e20d4f 100644 --- a/src/nix/flake.md +++ b/src/nix/flake.md @@ -292,6 +292,12 @@ The following attributes are supported in `flake.nix`: value (e.g. `packages.x86_64-linux` must be an attribute set of derivations built for the `x86_64-linux` platform). +* `nixConfig`: a set of `nix.conf` options to be set when evaluating any + part of a flake. In the interests of security, only a small set of + whitelisted options (currently `bash-prompt`, `brash-prompt-suffix`, + and `flake-registry`) are allowed to be set without confirmation so long as + `accept-flake-config` is not set in the global configuration. + ## Flake inputs The attribute `inputs` specifies the dependencies of a flake, as an From c746a429db0e48e60362b6ea45b5d01551ba46d6 Mon Sep 17 00:00:00 2001 From: lincoln auster Date: Tue, 25 Jan 2022 14:55:49 -0700 Subject: [PATCH 2/2] fix typo Co-authored-by: Cole Helbling --- src/nix/flake.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nix/flake.md b/src/nix/flake.md index db6e20d4f..accddd436 100644 --- a/src/nix/flake.md +++ b/src/nix/flake.md @@ -294,7 +294,7 @@ The following attributes are supported in `flake.nix`: * `nixConfig`: a set of `nix.conf` options to be set when evaluating any part of a flake. In the interests of security, only a small set of - whitelisted options (currently `bash-prompt`, `brash-prompt-suffix`, + whitelisted options (currently `bash-prompt`, `bash-prompt-suffix`, and `flake-registry`) are allowed to be set without confirmation so long as `accept-flake-config` is not set in the global configuration.