From 566afa1e9c804dd4a893960f30325a38c81a4c51 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 5 Dec 2012 11:02:44 +0100 Subject: Support xz compression of nixexprs.tar in channels --- scripts/nix-channel.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'scripts/nix-channel.in') diff --git a/scripts/nix-channel.in b/scripts/nix-channel.in index 7b292ee8cf64..4a480ae28b04 100755 --- a/scripts/nix-channel.in +++ b/scripts/nix-channel.in @@ -122,7 +122,9 @@ sub update { } # Download the channel tarball. - my $fullURL = "$url/nixexprs.tar.bz2"; + my $fullURL = "$url/nixexprs.tar.xz"; + system("$Nix::Config::curl --fail --silent --head '$fullURL' > /dev/null") == 0 or + $fullURL = "$url/nixexprs.tar.bz2"; print STDERR "downloading Nix expressions from `$fullURL'...\n"; my ($hash, $path) = `PRINT_PATH=1 QUIET=1 $Nix::Config::binDir/nix-prefetch-url '$fullURL'`; die "cannot fetch `$fullURL'\n" if $? != 0; -- cgit 1.4.1