nixpkgs/pkgs
Luca Bruno 08a6b7aa46 Revert "goPackages: disable parallel builds"
This reverts commit 75ed15e174.

Turns out it was just a missing &

cc @wkennington
2015-08-26 12:13:57 +02:00
..
applications Merge pull request #9450 from lebastr/rosegarden 2015-08-26 11:57:26 +02:00
build-support Merge branch 'staging' 2015-08-25 14:14:54 +02:00
data pecita: 5.0 -> 5.1 2015-08-25 16:36:43 +02:00
desktops gnome-contacts: fix evaluation 2015-08-26 07:57:57 +02:00
development Revert "goPackages: disable parallel builds" 2015-08-26 12:13:57 +02:00
games micropolis: fix patch hash, probably updated 2015-08-24 08:23:44 +02:00
misc Merge branch 'staging' 2015-08-25 14:14:54 +02:00
os-specific Merge branch 'staging' 2015-08-25 14:14:54 +02:00
servers Merge pull request #9376 from rick68/softether 2015-08-26 10:45:46 +02:00
shells add binutils to bash build for size 2015-08-12 11:27:54 -07:00
stdenv Merge branch 'master.upstream' into staging.upstream 2015-08-19 20:52:17 -07:00
test
tools Merge pull request #9449 from rycee/bump/svtplay-dl 2015-08-26 09:02:49 +02:00
top-level Merge pull request #9450 from lebastr/rosegarden 2015-08-26 11:57:26 +02:00