Commit Graph

11 Commits

Author SHA1 Message Date
Shea Levy
c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
Partial staging merge, including cc-wrapper fixes

Conflicts:
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
2015-02-02 21:14:28 -05:00
Markus Kohlhase
8295846f6f nixpkgs: torbrowser 4.0.2 -> 4.0.3 2015-01-25 09:03:19 +00:00
Eric Seidel
f3c6827373 rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc 2015-01-14 20:27:55 -08:00
John Wiegley
28b6fb61e6 Change occurrences of gcc to the more general cc
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
Austin Seipp
c3bdbd3b52 nixpkgs: tor-browser 4.0.1 -> 4.0.2
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-12-06 05:01:28 -06:00
Chris Double
32d09e2699 Update Tor Browser to 4.0.1
Updates Tor Browser to 4.0.1. This requires the gcc 4.9 runtime.

Add myself to the maintainers.
2014-11-18 23:46:42 +13:00
Eelco Dolstra
40f7b0f9df Another attempt to eradicate ensureDir
See c556a6ea46.
2014-06-30 14:56:10 +02:00
Chris Double
2deb3ca0aa Update tor to 0.2.4.22 and tor browser to 3.6.2 2014-06-13 14:21:53 +12:00
Chris Double
1d1a1c2585 Update tor-browser to 3.6 2014-05-14 02:03:51 +12:00
Matej Cotman
f4a3ea123b fix torbrowser build by adding /lib64 for 64 bit systems 2014-03-01 22:37:39 +01:00
Jaka Hudoklin
26357febb6 Add tor-browser 2014-01-12 23:04:48 +01:00