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
..
default.nix	unmaintain a bunch of packages	2015-01-13 22:33:49 +01:00
tor-arm.nix	tor-arm: kill tabs	2014-12-10 04:21:14 -06:00
torbrowser.nix	Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'	2015-02-02 21:14:28 -05:00
torsocks.nix	nixpkgs: torsocks 1.3 -> 2.0.0	2014-12-06 05:00:26 -06:00