mirror of
https://github.com/NixOS/nix
synced 2025-07-07 10:11:47 +02:00
* In `nix-channel --update', skip manifests that assume a Nix store at
a different location than the user's. This makes channels usable as a source deployment mechanism for people who install Nix under non-standard prefixes. (NIX-57)
This commit is contained in:
parent
68ae953d8a
commit
d43565c3e8
2 changed files with 21 additions and 2 deletions
|
@ -23,6 +23,7 @@ sub readChannels {
|
|||
open CHANNELS, "<$channelsList" or die "cannot open `$channelsList': $!";
|
||||
while (<CHANNELS>) {
|
||||
chomp;
|
||||
next if /^\s*\#/;
|
||||
push @channels, $_;
|
||||
}
|
||||
close CHANNELS;
|
||||
|
@ -81,7 +82,7 @@ sub update {
|
|||
# Pull cache manifests.
|
||||
foreach my $url (@channels) {
|
||||
print "pulling cache manifest from `$url'\n";
|
||||
system("@bindir@/nix-pull", "$url/MANIFEST") == 0
|
||||
system("@bindir@/nix-pull", "--skip-wrong-store", "$url/MANIFEST") == 0
|
||||
or die "cannot pull cache manifest from `$url'";
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue