lix-project/hydra
4
0
Fork 6
Code Issues 2 Pull requests Packages Projects Releases Wiki Activity

* Include the system type in manifests as a hint for the

Browse source 
binary patch generator.
This commit is contained in:
Eelco Dolstra 2010-11-26 14:34:58 +00:00
parent 0cee7c0909
commit a75a12e819
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/lib/Hydra/Helper/CatalystUtils.pm
View file

@ -123,10 +123,16 @@ sub getChannelData {
# `--include-outputs' flag passed to `nix-store'.
push @storePaths, $build->drvpath;
} else {
push @storePaths, $build->outpath;
push @storePaths, $build->outpath;
}
my $pkgName = $build->nixname . "-" . $build->system . "-" . $build->id;
$c->stash->{nixPkgs}->{"${pkgName}.nixpkg"} = {build => $build, name => $pkgName};
# Put the system type in the manifest (for top-level paths) as
# a hint to the binary patch generator. (It shouldn't try to
# generate patches between builds for different systems.) It
# would be nice if Nix stored this info for every path but it
# doesn't.
$c->stash->{systemForPath}->{$build->outpath} = $build->system;
};
$c->stash->{storePaths} = [@storePaths];

3
src/lib/Hydra/View/NixManifest.pm
View file

@ -33,6 +33,8 @@ sub process {
my $url = $c->stash->{narBase} . "/" . $escaped;
my $system = $c->stash->{systemForPath}->{$path};
$manifest .=
"{\n" .
" StorePath: $path\n" .
@ -41,6 +43,7 @@ sub process {
" NarURL: $url\n" .
" NarHash: $hash\n" .
($narSize != 0 ? " NarSize: $narSize\n" : "") .
(defined $system ? " System: $system\n" : "") .
"}\n";
}