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

nix-install-package: Support binary caches

Browse source 
The .nixpkg file format is extended to optionally include the URL of a
binary cache, which will be used in preference to the manifest URL
(which can be set to a non-existent value).
This commit is contained in:
Eelco Dolstra 2012-07-30 16:11:02 -04:00
parent d059bf48e4
commit ab42bf1dab
1 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
scripts/nix-install-package.in
View file

@ -101,7 +101,7 @@ my $pathRE = "(?: \/ [\/A-Za-z0-9\+\-\.\_\?\=]* )";
# store path. We'll let nix-env do that. # store path. We'll let nix-env do that.
$contents =~ $contents =~
/ ^ \s* (\S+) \s+ ($urlRE) \s+ ($nameRE) \s+ ($systemRE) \s+ ($pathRE) \s+ ($pathRE) /x / ^ \s* (\S+) \s+ ($urlRE) \s+ ($nameRE) \s+ ($systemRE) \s+ ($pathRE) \s+ ($pathRE) ( \s+ ($urlRE) )? /x
or barf "invalid package contents"; or barf "invalid package contents";
my $version = $1; my $version = $1;
my $manifestURL = $2; my $manifestURL = $2;
@ -109,6 +109,7 @@ my $drvName = $3;
my $system = $4; my $system = $4;
my $drvPath = $5; my $drvPath = $5;
my $outPath = $6; my $outPath = $6;
my $binaryCacheURL = $8;
barf "invalid package version `$version'" unless $version eq "NIXPKG1"; barf "invalid package version `$version'" unless $version eq "NIXPKG1";
@ -122,18 +123,26 @@ if ($interactive) {
} }
if (defined $binaryCacheURL) {
push @extraNixEnvArgs, "--option", "binary-caches", $binaryCacheURL;
} else {
# Store the manifest in the temporary directory so that we don't # Store the manifest in the temporary directory so that we don't
# pollute /nix/var/nix/manifests. This also requires that we don't # pollute /nix/var/nix/manifests. This also requires that we
# use the Nix daemon (because otherwise download-using-manifests won't # don't use the Nix daemon (because otherwise
# see our NIX_MANIFESTS_DIRS environment variable). # download-using-manifests won't see our NIX_MANIFESTS_DIRS
# environment variable).
$ENV{NIX_MANIFESTS_DIR} = $tmpDir; $ENV{NIX_MANIFESTS_DIR} = $tmpDir;
$ENV{NIX_REMOTE} = ""; $ENV{NIX_REMOTE} = "";
print "\nPulling manifests...\n"; print "\nPulling manifests...\n";
system("$Nix::Config::binDir/nix-pull", $manifestURL) == 0 system("$Nix::Config::binDir/nix-pull", $manifestURL) == 0
or barf "nix-pull failed: $?"; or barf "nix-pull failed: $?";
}
print "\nInstalling package...\n"; print "\nInstalling package...\n";
system("$Nix::Config::binDir/nix-env", "--install", $outPath, "--force-name", $drvName, @extraNixEnvArgs) == 0 system("$Nix::Config::binDir/nix-env", "--install", $outPath, "--force-name", $drvName, @extraNixEnvArgs) == 0