From 5bbd693caedd5d50994938555b3a4b535875347e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 23 Nov 2011 15:13:37 +0000 Subject: =?UTF-8?q?*=20Add=20an=20API=20function=20exportPaths()=20that=20?= =?UTF-8?q?provides=20the=20functionality=20of=20=20=20=E2=80=98nix-store?= =?UTF-8?q?=20--export=E2=80=99.=20*=20Add=20a=20Perl=20module=20that=20pr?= =?UTF-8?q?ovides=20the=20functionality=20of=20=20=20=E2=80=98nix-copy-clo?= =?UTF-8?q?sure=20--to=E2=80=99.=20=20This=20is=20used=20by=20build-remote?= =?UTF-8?q?.pl=20so=20it=20no=20=20=20longer=20needs=20to=20start=20a=20se?= =?UTF-8?q?parate=20nix-copy-closure=20process.=20=20Also,=20it=20=20=20us?= =?UTF-8?q?es=20the=20Perl=20API=20to=20do=20the=20export,=20so=20it=20doe?= =?UTF-8?q?sn't=20need=20to=20start=20a=20=20=20separate=20nix-store=20pro?= =?UTF-8?q?cess=20either.=20=20As=20a=20result,=20nix-copy-closure=20=20?= =?UTF-8?q?=20and=20build-remote.pl=20should=20no=20longer=20fail=20on=20v?= =?UTF-8?q?ery=20large=20closures=20due=20=20=20to=20an=20"Argument=20list?= =?UTF-8?q?=20too=20long"=20error.=20=20(Note=20that=20having=20very=20man?= =?UTF-8?q?y=20=20=20dependencies=20in=20a=20single=20derivation=20can=20s?= =?UTF-8?q?till=20fail=20because=20the=20=20=20environment=20can=20become?= =?UTF-8?q?=20too=20large.=20=20Can't=20be=20helped=20though.)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/build-remote.pl.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/build-remote.pl.in') diff --git a/scripts/build-remote.pl.in b/scripts/build-remote.pl.in index 110c95f22..72d09565b 100755 --- a/scripts/build-remote.pl.in +++ b/scripts/build-remote.pl.in @@ -5,6 +5,7 @@ use English '-no_match_vars'; use IO::Handle; use Nix::Config; use Nix::SSH qw/sshOpts openSSHConnection/; +use Nix::CopyClosure; no warnings('once'); @@ -225,8 +226,7 @@ sub removeRoots { # Copy the derivation and its dependencies to the build machine. -system("NIX_SSHOPTS=\"@sshOpts\" @bindir@/nix-copy-closure $hostName $maybeSign $drvPath @inputs") == 0 - or die "cannot copy inputs to $hostName: $?"; +Nix::CopyClosure::copyTo($hostName, [ @sshOpts ], [ $drvPath, @inputs ], "", "", 0, 0, $maybeSign ne ""); # Perform the build. -- cgit v1.2.3