diff options
| author | Luca Bruno <lethalman88@gmail.com> | 2015-08-26 12:12:52 +0200 |
|---|---|---|
| committer | Luca Bruno <lethalman88@gmail.com> | 2015-08-26 12:13:57 +0200 |
| commit | 08a6b7aa46eaa504633de24de383a958a5d42072 (patch) | |
| tree | 229bd2ad3657fc562bfb089ac64f79670ed300dd /pkgs/development/go-modules | |
| parent | 75ed15e174996139e439fdca407f03fadfe929da (diff) | |
| download | nixpkgs-08a6b7aa46eaa504633de24de383a958a5d42072.tar nixpkgs-08a6b7aa46eaa504633de24de383a958a5d42072.tar.gz nixpkgs-08a6b7aa46eaa504633de24de383a958a5d42072.tar.bz2 nixpkgs-08a6b7aa46eaa504633de24de383a958a5d42072.tar.lz nixpkgs-08a6b7aa46eaa504633de24de383a958a5d42072.tar.xz nixpkgs-08a6b7aa46eaa504633de24de383a958a5d42072.tar.zst nixpkgs-08a6b7aa46eaa504633de24de383a958a5d42072.zip | |
Revert "goPackages: disable parallel builds"
This reverts commit 75ed15e174996139e439fdca407f03fadfe929da. Turns out it was just a missing & cc @wkennington
Diffstat (limited to 'pkgs/development/go-modules')
| -rw-r--r-- | pkgs/development/go-modules/generic/default.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 7ab3c892f56..b5ddba9b981 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -80,8 +80,8 @@ go.stdenv.mkDerivation ( PIDS=() if [ -n "$subPackages" ] ; then for p in $subPackages ; do - go install $buildFlags "''${buildFlagsArray[@]}" -p $NIX_BUILD_CORES -v $goPackagePath/$p - #PIDS+=("$!") + go install $buildFlags "''${buildFlagsArray[@]}" -p $NIX_BUILD_CORES -v $goPackagePath/$p & + PIDS+=("$!") done else pushd go/src @@ -99,8 +99,8 @@ go.stdenv.mkDerivation ( if [ -n "$OUT" ]; then echo "$OUT" >&2 fi - } - #PIDS+=("$!") + } & + PIDS+=("$!") done < <(find $goPackagePath -type f -name \*.go -exec dirname {} \; | sort | uniq) popd fi @@ -119,16 +119,16 @@ go.stdenv.mkDerivation ( PIDS=() if [ -n "$subPackages" ] ; then for p in $subPackages ; do - go test -p $NIX_BUILD_CORES -v $goPackagePath/$p + go test -p $NIX_BUILD_CORES -v $goPackagePath/$p & done - #PIDS+=("$!") + PIDS+=("$!") else pushd go/src 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) popd - #PIDS+=("$!") + PIDS+=("$!") fi # Exit on error from the parallel process |