From 4b072cfe08e3d6878ac5e6bdbbcdc37e8a70aec9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 7 Oct 2014 00:22:10 +0200
Subject: [PATCH] Nixpkgs manual: Mention xz support

Issue #4393.
---
 doc/stdenv.xml | 17 ++++++++++-------
 1 file 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>