Branch: refs/heads/master
Home: https://github.com/NixOS/nix
Commit: 6de5d534164d95b0c004cd4b2ed9bf97f9903029
https://github.com/NixOS/nix/commit/6de5d534164d95b0c004cd4b2ed9bf97f9903029
Author: Eelco Dolstra <[email protected]>
Date: 2012-04-24 (Tue, 24 Apr 2012)
Changed paths:
M scripts/build-remote.pl.in
Log Message:
-----------
Fix a warning in the build hook about $progressViewer
diff --git a/scripts/build-remote.pl.in b/scripts/build-remote.pl.in
index fca0024..da5561c 100755
--- a/scripts/build-remote.pl.in
+++ b/scripts/build-remote.pl.in
@@ -248,7 +248,7 @@ if ($@) {
print STDERR "somebody is hogging $uploadLock, continuing...\n";
unlink $uploadLock;
}
-Nix::CopyClosure::copyTo($hostName, [ @sshOpts ], [ $drvPath, @inputs ], "",
"", 0, 0, $maybeSign ne "");
+Nix::CopyClosure::copyTo($hostName, [ @sshOpts ], [ $drvPath, @inputs ], "",
"", 0, 0, $maybeSign ne "", "");
close UPLOADLOCK;
================================================================
Commit: c722193a91cb32f2696d655cf6301cf5ccfae6ce
https://github.com/NixOS/nix/commit/c722193a91cb32f2696d655cf6301cf5ccfae6ce
Author: Eelco Dolstra <[email protected]>
Date: 2012-04-26 (Thu, 26 Apr 2012)
Changed paths:
M corepkgs/unpack-channel.nix
Log Message:
-----------
Don't use the build hook for unpacking channels
diff --git a/corepkgs/unpack-channel.nix b/corepkgs/unpack-channel.nix
index 170f3ab..0fc2b2f 100644
--- a/corepkgs/unpack-channel.nix
+++ b/corepkgs/unpack-channel.nix
@@ -8,4 +8,6 @@ derivation {
args = [ "-e" ./unpack-channel.sh ];
inherit name channelName src bzip2 tar tr;
PATH = "${nixBinDir}:${coreutils}";
+ # No point in doing this remotely.
+ preferLocalBuild = true;
}
================================================================
Compare: https://github.com/NixOS/nix/compare/6387830...c722193
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
