Commit Graph

23 Commits

Author SHA1 Message Date
Peter Simons
2d326e5032 Merge remote-tracking branch 'origin/master' into staging.
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
Evgeny Egorochkin
ecefc22d76 tor: update from 0.2.4.22 to 0.2.4.23 2014-07-31 14:36:06 +03:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02: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
Chris Double
f76e56fb38 Update tor to 0.2.4.21 2014-05-14 01:53:25 +12:00
Evgeny Egorochkin
76f7ea6e39 add repositories.git to several packages 2014-03-20 13:32:29 +02: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
Evgeny Egorochkin
d07d2eb137 torsocks: update to 1.3 2013-10-08 16:59:48 +03:00
Shea Levy
8934644d20 tor: minor cleanups
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 19:15:26 -05:00
Shea Levy
9a5ca5aced tor: Don't use NIX_CFLAGS_LINK where CFLAGS will do 2013-03-08 19:14:43 -05:00
Jack Cummings
e863477995 need to link against -lgcc_s for the testsuite to work 2013-03-08 07:43:30 -08:00
Evgeny Egorochkin
76d8b3a530 torsocks: version bump to 1.2 2013-01-15 08:13:56 +02:00
Evgeny Egorochkin
f2ca98c098 TOR: version bump 2012-12-05 06:16:45 +02:00
Evgeny Egorochkin
b01a720d65 TOR: version bump
svn path=/nixpkgs/trunk/; revision=32692
2012-02-29 13:30:01 +00:00
Evgeny Egorochkin
8db68032a6 Tor: version bump
svn path=/nixpkgs/trunk/; revision=26899
2011-04-20 09:25:50 +00:00
Evgeny Egorochkin
c76f114d20 tor:version bump
svn path=/nixpkgs/trunk/; revision=24944
2010-12-01 04:07:44 +00:00
Russell O'Connor
90aa3c3c3c New derivation for torsocks.
This will replace tsocks.


svn path=/nixpkgs/trunk/; revision=24011
2010-10-01 02:38:03 +00:00
Ludovic Courtès
c293598da8 tor: Add self as co-maintainer; add to Hydra; improve formatting.
svn path=/nixpkgs/trunk/; revision=21957
2010-05-24 21:28:54 +00:00
Ludovic Courtès
bf9d470cc7 tor: Fix test suite.
svn path=/nixpkgs/trunk/; revision=21956
2010-05-24 21:28:43 +00:00
Lluís Batlle i Rossell
a286b7c9b2 Adding tor 0.2.1.26
(Patch sent by roconnor)

svn path=/nixpkgs/trunk/; revision=21797
2010-05-16 16:23:32 +00:00