diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-10-07 00:22:10 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-10-07 00:22:10 +0200 |
commit | 4b072cfe08e3d6878ac5e6bdbbcdc37e8a70aec9 (patch) | |
tree | 10d6b60124ced8dde85b9fa74c748fc6d90efb0c /doc/stdenv.xml | |
parent | 46a9e805efeee40d360605fa5987866ca45fed23 (diff) | |
download | nixlib-4b072cfe08e3d6878ac5e6bdbbcdc37e8a70aec9.tar nixlib-4b072cfe08e3d6878ac5e6bdbbcdc37e8a70aec9.tar.gz nixlib-4b072cfe08e3d6878ac5e6bdbbcdc37e8a70aec9.tar.bz2 nixlib-4b072cfe08e3d6878ac5e6bdbbcdc37e8a70aec9.tar.lz nixlib-4b072cfe08e3d6878ac5e6bdbbcdc37e8a70aec9.tar.xz nixlib-4b072cfe08e3d6878ac5e6bdbbcdc37e8a70aec9.tar.zst nixlib-4b072cfe08e3d6878ac5e6bdbbcdc37e8a70aec9.zip |
Nixpkgs manual: Mention xz support
Issue #4393.
Diffstat (limited to 'doc/stdenv.xml')
-rw-r--r-- | doc/stdenv.xml | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/doc/stdenv.xml b/doc/stdenv.xml index 28e7b7d89f4b..8c6266b2672a 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -150,8 +150,8 @@ genericBuild <listitem><para>GNU <command>tar</command>.</para></listitem> - <listitem><para><command>gzip</command> and - <command>bzip2</command>.</para></listitem> + <listitem><para><command>gzip</command>, <command>bzip2</command> + and <command>xz</command>.</para></listitem> <listitem><para>GNU Make. It has been patched to provide <quote>nested</quote> output that can be fed into the @@ -341,9 +341,11 @@ It supports the following files by default: <term>Tar files</term> <listitem><para>These can optionally be compressed using <command>gzip</command> (<filename>.tar.gz</filename>, - <filename>.tgz</filename> or <filename>.tar.Z</filename>) or + <filename>.tgz</filename> or <filename>.tar.Z</filename>), <command>bzip2</command> (<filename>.tar.bz2</filename> or - <filename>.tbz2</filename>).</para></listitem> + <filename>.tbz2</filename>) or <command>xz</command> + (<filename>.tar.xz</filename> or + <filename>.tar.lzma</filename>).</para></listitem> </varlistentry> <varlistentry> @@ -445,9 +447,10 @@ Additional file types can be supported by setting the <listitem><para>The list of patches. They must be in the format accepted by the <command>patch</command> command, and may optionally be compressed using <command>gzip</command> - (<filename>.gz</filename>) or <command>bzip2</command> - (<filename>.bz2</filename>).</para></listitem> - </varlistentry> + (<filename>.gz</filename>), <command>bzip2</command> + (<filename>.bz2</filename>) or <command>xz</command> + (<filename>.xz</filename>).</para></listitem> + </varlistentry> <varlistentry> <term><varname>patchFlags</varname></term> |