From c48617671df2a1b894f802bf78f97e9c9dd7cf27 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 12 Jun 2015 01:56:34 +0200 Subject: [PATCH] nix-channel: Fix bogus error message caused by 8a84bd8c8bda1e4c6764c10ecdef9d74e4884800 --- scripts/nix-channel.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/nix-channel.in b/scripts/nix-channel.in index 0b499c3f7..05716645a 100755 --- a/scripts/nix-channel.in +++ b/scripts/nix-channel.in @@ -116,13 +116,13 @@ sub update { my $path; my $ret = -1; - if (-e "$tmpdir/$filename") { - # Get our temporary download into the store + if (-e "$tmpdir/$filename" && $filename =~ /\.tar\.(gz|bz2|xz)$/) { + # Get our temporary download into the store. (my $hash, $path) = `PRINT_PATH=1 QUIET=1 $Nix::Config::binDir/nix-prefetch-url 'file://$tmpdir/$filename'`; chomp $path; # Try unpacking the expressions to see if they'll be valid for us to process later. - # Like anything in nix, this will cache the result so we don't do it again outside of the loop below + # Like anything in nix, this will cache the result so we don't do it again outside of the loop below. $ret = system("$Nix::Config::binDir/nix-build --no-out-link -E 'import " . "{ name = \"$cname\"; channelName = \"$name\"; src = builtins.storePath \"$path\"; }'"); }