Commit Graph

46 Commits

Author SHA1 Message Date
sternenseemann
7d20f1b5b7 torbrowser: 6.0.4 -> 6.0.5 2016-09-16 15:57:22 +02:00
Kirill Boltaev
bccd75094f treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
Joachim Fasting
cb5a2acaa1
torbrowser: 6.0.2 -> 6.0.4
Tested briefly on x86_64-linux

Closes: https://github.com/NixOS/nixpkgs/issues/17750
2016-08-17 20:53:47 +02:00
Joachim Fasting
9675384c7b
torbrowser: 6.0.1 -> 6.0.2 2016-06-23 00:55:54 +02:00
Joachim Fasting
8fc6ca75a9
torbrowser: 6.0 -> 6.0.1 2016-06-08 16:51:53 +02:00
Joachim Fasting
961164a8a7
torbrowser: explicitly set paths to torrc-defaults and tor
This patch fixes an issue introduced by b897f825942b63ab790cad9ed66c8a79cbb3fc2d
where the bundled tor fails to run.

The error message claims that it cannot communicate with tor, but what actually
happens is that tor never runs at all, because it is invoked with a non-existent
rc file.  Specifying an absolute path to the torrc-defaults file fixes the
problem.  For good measure, we specify an absolute path to the tor executable
itself as well; we want as little autodetection logic as possible.

Note that users of torbrowser *must* remove the existing `~/.torbrowser4` folder
for this to take effect, otherwise torbrowser will continue to use extension
data from the previous release (this is why some existing users were able to
successfully use the new torbrowser version, see
https://github.com/NixOS/nixpkgs/pull/15854).
2016-05-31 23:37:20 +02:00
Mayeu - Cast
4e20fa47e0 torbrowser: 5.5.5 -> 6.0 (#15854) 2016-05-31 15:12:19 +02:00
Joachim Fasting
0a04f7a870
torbrowser: fix paths to pluggable transports
With this patch I'm at least able to connect using the obfs4 transport
2016-05-01 21:27:25 +02:00
Joachim Fasting
c3f54960c6
torbrowser: wrapper improvements
This brings the wrapper closer to the upstream wrapper.

Briefly,
- exec to prevent the shell from hanging around
- do not connect to session manager
- set WM_CLASS to "Tor Browser"
- use fonts.conf from the torbrowser bundle
2016-04-29 18:42:09 +02:00
Joachim Fasting
85aece2f8e
torbrowser: use makeLibraryPath instead of buildEnv
Also remove redundant buildInputs
2016-04-29 18:18:48 +02:00
Joachim Fasting
cdd6369679
torbrowser: add myself to maintainers 2016-04-28 23:33:27 +02:00
Joachim Fasting
4741627bcf
torbrowser: fix argument handling in wrapper
With $@ unquoted, the wrapper would always just pass "" to firefox
2016-04-28 23:33:26 +02:00
Joachim Fasting
38ea8c6c30
torbrowser: 5.5.4 -> 5.5.5 2016-04-28 23:33:26 +02:00
Joachim Fasting
0122cbfd59
torbrowser: also install lib and out into the torEnv 2016-04-22 04:21:33 +02:00
Joachim Fasting
008d47131f
Revert "torbrowser: fix torEnv after multiple-outputs"
This reverts commit 672efb940f.

This is a terrible fix, use buildEnv's extraOutputsToInstall instead.
2016-04-22 04:21:33 +02:00
Joachim Fasting
672efb940f
torbrowser: fix torEnv after multiple-outputs 2016-04-22 04:08:33 +02:00
lukasepple
1dbf51416a torbrowser: 5.5.3 -> 5.5.4 2016-03-19 21:56:57 +01:00
Joachim Fasting
665e79324e torbrowser: 5.5.2 -> 5.5.3 2016-03-15 02:34:53 +01:00
Franz Pletz
ffef91e914 torbrowser: 5.5 -> 5.5.2 2016-02-15 03:54:44 +01:00
Mayeu (Cast)
41204b1dd1 torbrowser: 5.0.7 -> 5.5
Hash found with nix-prefetch-url
2016-01-29 11:14:44 +01:00
Jakob Gillich
87c3063d68 torbrowser: 5.0.6 -> 5.0.7, add desktop file 2016-01-18 14:47:33 +01:00
Jakob Gillich
24dc7f3028 torbrowser: add missing shebang to wrapper script 2016-01-05 18:21:07 +01:00
codsl
8fb46420ef torbrowser: 5.0.4 -> 5.0.6 2015-12-27 09:31:23 +00:00
ruebezahl
0069867c51 update 5.0.3 -> 5.0.4 2015-11-08 18:07:02 +01:00
Joachim Fasting
e1ca9303d2 torbrowser: 4.5.3 -> 5.0.3
torbrowser 5.0.3 requires gcc5, otherwise it fails with

   libstdc++.so.6: version `GLIBCXX_3.4.21' not found (required by Browser/firefox)
2015-10-03 15:02:08 +02:00
Joachim Fasting
c34cc5d54e torbrowser: use stdenv.is64bit 2015-10-03 14:27:57 +02:00
Vladimír Čunát
88c9f8b574 xlibs: replace occurrences by xorg
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
2015-09-15 12:54:34 +02:00
Lancelot SIX
ca54849eb9 torbrowser: 4.5.2 -> 4.5.3 (close #8953) 2015-07-30 15:55:22 +02:00
hiberno
deadb4e0aa tor-browser: update 4.5.1 to 4.5.2, closes #8379 2015-06-18 11:25:32 +02:00
Chris Double
609002cc94 Update tor-browser to 4.5.1 2015-05-19 14:52:52 +12:00
Chris Double
d941d4c26e Update tor-browser to 4.5 2015-04-29 11:58:52 +12:00
_1126
319d42941e tor-browser: bump to 4.0.8 2015-04-11 12:46:47 +02:00
_1126
64758a6429 tor-browser: bumps to 4.0.6 2015-04-07 15:37:57 +02:00
Chris Double
9369daf134 Update tor-browser to 4.0.5 2015-03-25 13:39:23 +13:00
_1126
f1f3c2c775 torbrowser: bump version to 4.0.4 2015-03-14 14:36:25 +01:00
Vladimír Čunát
dbae4f109f Merge branch 'master' into staging
Conflicts (relatively simple):
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
2015-01-31 19:34:57 +01: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