lunaphied/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

nix-channel: Fix bogus error message caused by 8a84bd8c8b

Browse source
This commit is contained in:
Eelco Dolstra 2015-06-12 01:56:34 +02:00
parent d1e4b76a3a
commit c48617671d
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scripts/nix-channel.in
View file

@ -116,13 +116,13 @@ sub update {
my $path; my $path;
my $ret = -1; my $ret = -1;
if (-e "$tmpdir/$filename") { if (-e "$tmpdir/$filename" && $filename =~ /\.tar\.(gz|bz2|xz)$/) {
# Get our temporary download into the store # Get our temporary download into the store.
(my $hash, $path) = `PRINT_PATH=1 QUIET=1 $Nix::Config::binDir/nix-prefetch-url 'file://$tmpdir/$filename'`; (my $hash, $path) = `PRINT_PATH=1 QUIET=1 $Nix::Config::binDir/nix-prefetch-url 'file://$tmpdir/$filename'`;
chomp $path; chomp $path;
# Try unpacking the expressions to see if they'll be valid for us to process later. # 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 <nix/unpack-channel.nix> " . $ret = system("$Nix::Config::binDir/nix-build --no-out-link -E 'import <nix/unpack-channel.nix> " .
"{ name = \"$cname\"; channelName = \"$name\"; src = builtins.storePath \"$path\"; }'"); "{ name = \"$cname\"; channelName = \"$name\"; src = builtins.storePath \"$path\"; }'");
} }