summary refs log tree commit diff
path: root/doc
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2020-10-06 10:25:58 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2020-10-06 10:25:58 +0200
commit692d219a9312fbe3f8b34858a7ca0e32fb72bd07 (patch)
tree4c0f5e46b2cf639e71acb43990697d769a969d2c /doc
parentc1a0aa7eb73f86b0224a57671752673befe08953 (diff)
parent82390e264704e4e1bf1652c9bebdc30a48f7fd07 (diff)
downloadnixpkgs-692d219a9312fbe3f8b34858a7ca0e32fb72bd07.tar
nixpkgs-692d219a9312fbe3f8b34858a7ca0e32fb72bd07.tar.gz
nixpkgs-692d219a9312fbe3f8b34858a7ca0e32fb72bd07.tar.bz2
nixpkgs-692d219a9312fbe3f8b34858a7ca0e32fb72bd07.tar.lz
nixpkgs-692d219a9312fbe3f8b34858a7ca0e32fb72bd07.tar.xz
nixpkgs-692d219a9312fbe3f8b34858a7ca0e32fb72bd07.tar.zst
nixpkgs-692d219a9312fbe3f8b34858a7ca0e32fb72bd07.zip
Merge staging-next into staging
Diffstat (limited to 'doc')
-rw-r--r--doc/stdenv/stdenv.xml9
1 files changed, 6 insertions, 3 deletions
diff --git a/doc/stdenv/stdenv.xml b/doc/stdenv/stdenv.xml
index 6871fad6075..4c069b57edd 100644
--- a/doc/stdenv/stdenv.xml
+++ b/doc/stdenv/stdenv.xml
@@ -475,9 +475,12 @@ passthru.updateScript = writeScript "update-zoom-us" ''
 <programlisting>
 passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ];
 </programlisting>
-     </para>
-     <para>
-      The script will be usually run from the root of the Nixpkgs repository but you should not rely on that. Also note that the update scripts will be run in parallel by default; you should avoid running <command>git commit</command> or any other commands that cannot handle that.
+      The script will be run with <varname>UPDATE_NIX_ATTR_PATH</varname> environment variable set to the attribute path it is supposed to update.
+      <note>
+       <para>
+        The script will be usually run from the root of the Nixpkgs repository but you should not rely on that. Also note that the update scripts will be run in parallel by default; you should avoid running <command>git commit</command> or any other commands that cannot handle that.
+       </para>
+      </note>
      </para>
      <para>
       For information about how to run the updates, execute <command>nix-shell maintainers/scripts/update.nix</command>.