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
Ludovic Courtès
41b53577a8
unmaintain a bunch of packages
2015-01-13 22:33:49 +01: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
5c52382448
tor-arm: kill tabs
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-12-10 04:21:14 -06:00
Austin Seipp
7a51e5f416
nixpkgs: fix tor-arm dependencies
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-12-10 04:14:11 -06:00
Austin Seipp
0d63eae992
tor-arm: Fix python path
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-12-10 04:06:02 -06:00
Austin Seipp
b31283dd8b
nixpkgs: add tor-arm 1.4.5.0
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-12-10 03:59:59 -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
Austin Seipp
92eb86e110
nixpkgs: add myself as a 'tor' maintainer
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-12-06 05:01:27 -06:00
Austin Seipp
c206c728a8
nixpkgs: tor depends on torsocks
...
This may seem strange, but tor distributes its 'torify' wrapper which in
turn attempts to use torsocks to bridge a connection, meaning 'tor'
users out the box may want it to work.
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-12-06 05:00:27 -06:00
Austin Seipp
d92d0eca92
nixpkgs: torsocks 1.3 -> 2.0.0
...
Additionally, this fixes 'torsocks' using the 'which' executable as a
dependency.
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-12-06 05:00:26 -06:00
vbgl
3e8fd1b30b
Merge pull request #5014 from doublec/tor
...
Update Tor to 0.2.5.10.
2014-11-21 07:33:53 +00: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
Chris Double
75425ff879
Update Tor to 0.2.5.10.
...
Updates Tor to latest stable version.
Add myself to the maintainer list.
2014-11-18 01:47:42 +13:00
Evgeny Egorochkin
ac8c944332
add myself as a maintainer
2014-11-05 11:35:32 +02:00
Evgeny Egorochkin
a6dc9ce957
tor: update from 0.2.4.23 to 0.2.4.24
2014-10-25 20:31:54 +03:00
Bjørn Forsman
c9baba9212
Fix many package descriptions
...
(My OCD kicked in today...)
Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.
I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.
I've tried to stay away from generated expressions (and I think I
succeeded).
Some specifics worth mentioning:
* cron, has "Vixie Cron" in its description. The "Vixie" part is not
mentioned anywhere else. I kept it in a parenthesis at the end of the
description.
* ctags description started with "Exuberant Ctags ...", and the
"exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
at the end of description.
* nix has the description "The Nix Deployment System". Since that
doesn't really say much what it is/does (especially after removing
the package name!), I changed that to "Powerful package manager that
makes package management reliable and reproducible" (borrowed from
nixos.org).
* Tons of "GNU Foo, Foo is a [the important bits]" descriptions
is changed to just [the important bits]. If the package name doesn't
contain GNU I don't think it's needed to say it in the description
either.
2014-08-24 22:31:37 +02:00
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