Merge pull request #44447 from NixOS/staging-next

Staging next
2018-08-09 09:04:03 +02:00
parent 12c05697b5 94e608d587
commit 786cbba7be
22 changed files with 278 additions and 222 deletions
@@ -836,9 +836,10 @@ passthru = {
        These can optionally be compressed using <command>gzip</command>
        (<filename>.tar.gz</filename>, <filename>.tgz</filename> or
        <filename>.tar.Z</filename>), <command>bzip2</command>
-        (<filename>.tar.bz2</filename> or <filename>.tbz2</filename>) or
-        <command>xz</command> (<filename>.tar.xz</filename> or
-        <filename>.tar.lzma</filename>).
+        (<filename>.tar.bz2</filename>, <filename>.tbz2</filename> or
+        <filename>.tbz</filename>) or <command>xz</command>
+        (<filename>.tar.xz</filename>, <filename>.tar.lzma</filename> or
+        <filename>.txz</filename>).
       </para>
      </listitem>
     </varlistentry>