···836836 These can optionally be compressed using <command>gzip</command>
837837 (<filename>.tar.gz</filename>, <filename>.tgz</filename> or
838838 <filename>.tar.Z</filename>), <command>bzip2</command>
839839- (<filename>.tar.bz2</filename> or <filename>.tbz2</filename>) or
840840- <command>xz</command> (<filename>.tar.xz</filename> or
841841- <filename>.tar.lzma</filename>).
839839+ (<filename>.tar.bz2</filename>, <filename>.tbz2</filename> or
840840+ <filename>.tbz</filename>) or <command>xz</command>
841841+ (<filename>.tar.xz</filename>, <filename>.tar.lzma</filename> or
842842+ <filename>.txz</filename>).
842843 </para>
843844 </listitem>
844845 </varlistentry>
+1-1
pkgs/build-support/release/functions.sh
···11findTarball() {
22 local suffix i
33 if [ -d "$1/tarballs/" ]; then
44- for suffix in tar.gz tgz tar.bz2 tbz2 tar.xz tar.lzma; do
44+ for suffix in tar.gz tgz tar.bz2 tbz2 tbz tar.xz txz tar.lzma; do
55 for i in $1/tarballs/*.$suffix; do echo $i; break; done
66 done | sort | head -1
77 return
+2-2
pkgs/stdenv/generic/setup.sh
···801801 else
802802803803 case "$fn" in
804804- *.tar.xz | *.tar.lzma)
804804+ *.tar.xz | *.tar.lzma | *.txz)
805805 # Don't rely on tar knowing about .xz.
806806 xz -d < "$fn" | tar xf -
807807 ;;
808808- *.tar | *.tar.* | *.tgz | *.tbz2)
808808+ *.tar | *.tar.* | *.tgz | *.tbz2 | *.tbz)
809809 # GNU tar can automatically select the decompression method
810810 # (info "(tar) gzip").
811811 tar xf "$fn"