Fix NixOS 15.09 channel generation
This commit is contained in:
parent
f46cb14bb7
commit
373d8b7b38
1 changed files with 3 additions and 2 deletions
|
@ -50,8 +50,9 @@ my $rev = $evalInfo->{jobsetevalinputs}->{nixpkgs}->{revision} or die;
|
|||
print STDERR "release is ‘$releaseName’ (build $releaseId), eval is $evalId, dir is ‘$releaseDir’, Git commit is $rev\n";
|
||||
|
||||
# Guard against the channel going back in time.
|
||||
my $curRelease = basename(readlink "$channelsDir/$channelName");
|
||||
if (defined $curRelease) {
|
||||
my $curReleaseDir = readlink "$channelsDir/$channelName";
|
||||
if (defined $curReleaseDir) {
|
||||
my $curRelease = basename($curReleaseDir);
|
||||
my $d = `nix-instantiate --eval -E "builtins.compareVersions (builtins.parseDrvName \\"$curRelease\\").version (builtins.parseDrvName \\"$releaseName\\").version"`;
|
||||
chomp $d;
|
||||
die "channel would go back in time from $curRelease to $releaseName, bailing out\n" if $d == 1;
|
||||
|
|
Loading…
Reference in a new issue