pyrox.dev / nixpkgs
lol
fork atom

stdenv/build-support: support .tbz and .txz tarballs

James Deikun bd63de11 80b5f522

+7 -6
unified split
+4 -3
doc/stdenv.xml
··· 836 These can optionally be compressed using <command>gzip</command> 837 (<filename>.tar.gz</filename>, <filename>.tgz</filename> or 838 <filename>.tar.Z</filename>), <command>bzip2</command> 839 - (<filename>.tar.bz2</filename> or <filename>.tbz2</filename>) or 840 - <command>xz</command> (<filename>.tar.xz</filename> or 841 - <filename>.tar.lzma</filename>). 842 </para> 843 </listitem> 844 </varlistentry>
··· 836 These can optionally be compressed using <command>gzip</command> 837 (<filename>.tar.gz</filename>, <filename>.tgz</filename> or 838 <filename>.tar.Z</filename>), <command>bzip2</command> 839 + (<filename>.tar.bz2</filename>, <filename>.tbz2</filename> or 840 + <filename>.tbz</filename>) or <command>xz</command> 841 + (<filename>.tar.xz</filename>, <filename>.tar.lzma</filename> or 842 + <filename>.txz</filename>). 843 </para> 844 </listitem> 845 </varlistentry>
+1 -1
pkgs/build-support/release/functions.sh
··· 1 findTarball() { 2 local suffix i 3 if [ -d "$1/tarballs/" ]; then 4 - for suffix in tar.gz tgz tar.bz2 tbz2 tar.xz tar.lzma; do 5 for i in $1/tarballs/*.$suffix; do echo $i; break; done 6 done | sort | head -1 7 return
··· 1 findTarball() { 2 local suffix i 3 if [ -d "$1/tarballs/" ]; then 4 + for suffix in tar.gz tgz tar.bz2 tbz2 tbz tar.xz txz tar.lzma; do 5 for i in $1/tarballs/*.$suffix; do echo $i; break; done 6 done | sort | head -1 7 return
+2 -2
pkgs/stdenv/generic/setup.sh
··· 801 else 802 803 case "$fn" in 804 - *.tar.xz | *.tar.lzma) 805 # Don't rely on tar knowing about .xz. 806 xz -d < "$fn" | tar xf - 807 ;; 808 - *.tar | *.tar.* | *.tgz | *.tbz2) 809 # GNU tar can automatically select the decompression method 810 # (info "(tar) gzip"). 811 tar xf "$fn"
··· 801 else 802 803 case "$fn" in 804 + *.tar.xz | *.tar.lzma | *.txz) 805 # Don't rely on tar knowing about .xz. 806 xz -d < "$fn" | tar xf - 807 ;; 808 + *.tar | *.tar.* | *.tgz | *.tbz2 | *.tbz) 809 # GNU tar can automatically select the decompression method 810 # (info "(tar) gzip"). 811 tar xf "$fn"