summary refs log tree commit diff
path: root/pkgs/stdenv
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2023-11-09 06:01:11 +0000
committerGitHub <noreply@github.com>2023-11-09 06:01:11 +0000
commit4aad65bfdbc56be726873b09b4bbaa88448ecbba (patch)
tree52afb5cf285c4c4122657f7da7de2d5fcfbd9c15 /pkgs/stdenv
parente49468c2669c013e20e37ddb69cea65b5af8f687 (diff)
parenta0eb0aa889311cdaccd688cd88f23e2a8af61a0b (diff)
downloadnixpkgs-4aad65bfdbc56be726873b09b4bbaa88448ecbba.tar
nixpkgs-4aad65bfdbc56be726873b09b4bbaa88448ecbba.tar.gz
nixpkgs-4aad65bfdbc56be726873b09b4bbaa88448ecbba.tar.bz2
nixpkgs-4aad65bfdbc56be726873b09b4bbaa88448ecbba.tar.lz
nixpkgs-4aad65bfdbc56be726873b09b4bbaa88448ecbba.tar.xz
nixpkgs-4aad65bfdbc56be726873b09b4bbaa88448ecbba.tar.zst
nixpkgs-4aad65bfdbc56be726873b09b4bbaa88448ecbba.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r--pkgs/stdenv/generic/check-meta.nix5
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix
index 63fd00d266e..9a794531bc1 100644
--- a/pkgs/stdenv/generic/check-meta.nix
+++ b/pkgs/stdenv/generic/check-meta.nix
@@ -152,9 +152,8 @@ let
 
     # flakeNote will be printed in the remediation messages below.
     flakeNote = "
- Note: For `nix shell`, `nix build`, `nix develop` or any other Nix 2.4+
- (Flake) command, `--impure` must be passed in order to read this
- environment variable.
+   Note: When using `nix shell`, `nix build`, `nix develop`, etc with a flake,
+         then pass `--impure` in order to allow use of environment variables.
     ";
 
   remediate_allowlist = allow_attr: rebuild_amendment: attrs: