diff options
| -rwxr-xr-x | scripts/nix-channel.in | 2 | ||||
| -rwxr-xr-x | scripts/nix-pull.in | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/scripts/nix-channel.in b/scripts/nix-channel.in index 64e5aa01282b..2bf5e633e85b 100755 --- a/scripts/nix-channel.in +++ b/scripts/nix-channel.in @@ -88,6 +88,7 @@ sub update { my $exprs = ""; foreach my $name (keys %channels) { my $url = $channels{$name}; + my $origUrl = $url; # Check if $url is a redirect. If so, follow it now to ensure # consistency if the redirection is changed between @@ -98,6 +99,7 @@ sub update { $url = $1 if $headers =~ /^Location:\s*(.*)\s*$/m; # Pull the channel manifest. + $ENV{'NIX_ORIG_URL'} = $origUrl; system("$Nix::Config::binDir/nix-pull", "--skip-wrong-store", "$url/MANIFEST") == 0 or die "cannot pull manifest from `$url'\n"; diff --git a/scripts/nix-pull.in b/scripts/nix-pull.in index 084197c48a1c..8d5db2f57c68 100755 --- a/scripts/nix-pull.in +++ b/scripts/nix-pull.in @@ -72,7 +72,7 @@ sub processURL { my $urlFile = "$manifestDir/$baseName-$hash.url"; open URL, ">$urlFile" or die "cannot create `$urlFile'"; - print URL "$url"; + print URL ($ENV{'NIX_ORIG_URL'} || $url); close URL; my $finalPath = "$manifestDir/$baseName-$hash.nixmanifest"; |