diff --git a/scripts/nix-pull.in b/scripts/nix-pull.in index 040ee54c9d..f0d5d95f25 100644 --- a/scripts/nix-pull.in +++ b/scripts/nix-pull.in @@ -52,10 +52,10 @@ foreach my $storepath (keys %storepaths2urls) { my $hash = $urls2hashes{$url}; my $fetch = "(import @datadir@/nix/corepkgs/fetchurl) " . - "{url = $url; md5 = \"$hash\"; system = \"@system@\"}"; + "{url = $url; md5 = \"$hash\"; system = \"@system@\";}"; my $nixexpr = "((import @datadir@/nix/corepkgs/nar/unnar.nix) " . - "{narFile = ($fetch); outPath = \"$storepath\"; system = \"@system@\"}) "; + "{narFile = ($fetch); outPath = \"$storepath\"; system = \"@system@\";}) "; $fullexpr .= $nixexpr; # !!! O(n^2)? push @storepaths, $storepath; } @@ -104,6 +104,6 @@ while (scalar @sucs > 0) { if ($n > 256) { $n = 256 }; my @sucs2 = @sucs[0..$n - 1]; @sucs = @sucs[$n..scalar @sucs - 1]; - system "nix-store --successor @sucs"; + system "nix-store --successor @sucs2"; if ($?) { die "`nix-store --successor' failed"; } } diff --git a/scripts/nix-push.in b/scripts/nix-push.in index f178ae2b6b..275f5e99b8 100644 --- a/scripts/nix-push.in +++ b/scripts/nix-push.in @@ -45,7 +45,7 @@ foreach my $path (@paths) { my $nixexpr = "((import @datadir@/nix/corepkgs/nar/nar.nix) " . # !!! $path should be represented as a closure - "{path = \"$path\"; system = \"@system@\"}) "; + "{path = \"$path\"; system = \"@system@\";}) "; print NIX $nixexpr; }