BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "goPackages: disable parallel builds"

Browse source 
This reverts commit 75ed15e174.

Turns out it was just a missing &

cc @wkennington
This commit is contained in:
Luca Bruno 2015-08-26 12:12:52 +02:00
parent 75ed15e174
commit 08a6b7aa46
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkgs/development/go-modules/generic/default.nix
View file

@ -80,8 +80,8 @@ go.stdenv.mkDerivation (
PIDS=() PIDS=()
if [ -n "$subPackages" ] ; then if [ -n "$subPackages" ] ; then
for p in $subPackages ; do for p in $subPackages ; do
go install $buildFlags "''${buildFlagsArray[@]}" -p $NIX_BUILD_CORES -v $goPackagePath/$p go install $buildFlags "''${buildFlagsArray[@]}" -p $NIX_BUILD_CORES -v $goPackagePath/$p &
#PIDS+=("$!") PIDS+=("$!")
done done
else else
pushd go/src pushd go/src
@ -99,8 +99,8 @@ go.stdenv.mkDerivation (
if [ -n "$OUT" ]; then if [ -n "$OUT" ]; then
echo "$OUT" >&2 echo "$OUT" >&2
fi fi
} } &
#PIDS+=("$!") PIDS+=("$!")
done < <(find $goPackagePath -type f -name \*.go -exec dirname {} \; | sort | uniq) done < <(find $goPackagePath -type f -name \*.go -exec dirname {} \; | sort | uniq)
popd popd
fi fi
@ -119,16 +119,16 @@ go.stdenv.mkDerivation (
PIDS=() PIDS=()
if [ -n "$subPackages" ] ; then if [ -n "$subPackages" ] ; then
for p in $subPackages ; do for p in $subPackages ; do
go test -p $NIX_BUILD_CORES -v $goPackagePath/$p go test -p $NIX_BUILD_CORES -v $goPackagePath/$p &
done done
#PIDS+=("$!") PIDS+=("$!")
else else
pushd go/src pushd go/src
while read d; do while read d; do
go test -p $NIX_BUILD_CORES -v $d go test -p $NIX_BUILD_CORES -v $d &
done < <(find $goPackagePath -type f -name \*_test.go -exec dirname {} \; | sort | uniq) done < <(find $goPackagePath -type f -name \*_test.go -exec dirname {} \; | sort | uniq)
popd popd
#PIDS+=("$!") PIDS+=("$!")
fi fi
# Exit on error from the parallel process # Exit on error from the parallel process