Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixos-channel-scripts
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 059ee08f5c73
Choose a base ref
...
head repository: NixOS/nixos-channel-scripts
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5146d2cb25c3
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 3, 2020

  1. mirror-branch: Bails when failing to run nix-instantiate 

    A more durable solution would likely be to make a generic function that
wraps backticks and fails when $? is non-zero, rather than doing it
in-situ. There are other backtick uses that may be problematic
    @samueldr
    samueldr committed Jan 3, 2020
    Copy the full SHA
    cac10f5 View commit details

  2. Merge pull request #30 from samueldr/fix/2020-01-02-mirror-issue 

    mirror-branch: Bails when failing to run nix-instantiate
    @grahamc
    grahamc authored Jan 3, 2020
    Copy the full SHA
    5146d2c View commit details
Showing with 8 additions and 0 deletions.
  1. +8 −0 mirror-nixos-branch.pl
8 changes: 8 additions & 0 deletions mirror-nixos-branch.pl
View file
Original file line number Diff line number Diff line change
@@ -76,6 +76,14 @@ sub fetch {
my @curReleaseUrl = split(/\//, read_file("$channelsDir/$channelName", err_mode => 'quiet') // "");
my $curRelease = pop @curReleaseUrl;
my $d = `NIX_PATH= nix-instantiate --eval -E "builtins.compareVersions (builtins.parseDrvName \\"$curRelease\\").version (builtins.parseDrvName \\"$releaseName\\").version"`;
if ($? == -1) {
warn("could not execute nix-instantiate ($!).\n");
exit 127;
}
if ($? > 0) {
warn("error while executing nix-instantiate ($?).\n");
exit $?;
}
chomp $d;
if ($d == 1) {
warn("channel would go back in time from $curRelease to $releaseName, bailing out\n");