Vladimír Čunát 8da52a642a Merge branch 'staging' into v/modular ... Conflicts (easy): pkgs/development/interpreters/perl/5.10/setup-hook.sh pkgs/development/interpreters/perl/5.8/setup-hook.sh pkgs/development/libraries/gtk+/2.x.nix		2014-08-31 12:23:18 +02:00
..
build-node-package.nix	Merge pull request #3337 from tailhook/node_permission_error	2014-08-23 12:38:35 +04:00
default.nix	Merge 'staging' into multiple-outputs	2014-08-23 16:04:53 +02:00
no-xcode.patch	nodejs: fix the patch to make it build on darwin	2014-02-04 18:03:21 +01:00
setup-hook.sh	Cleanup: Use += to append to envHooks	2014-08-09 12:47:05 +02:00