Commit graph

111 commits

Author SHA1 Message Date
Susan Potter
75cdbf48ae
torbrowser: 6.0.6 -> 6.0.7 2016-12-01 00:13:58 -06:00
Frederik Rietdijk
09a5864d28 tor-arm: use python2 2016-11-24 22:28:03 +01:00
Joachim Fasting
f477bc98be
torbrowser: 6.0.5 -> 6.0.6 2016-11-15 22:57:35 +01:00
Frederik Rietdijk
e56832d730 Merge remote-tracking branch 'upstream/master' into HEAD 2016-10-22 17:23:24 +02:00
Joachim Fasting
b3ffc580ec
tor: 0.2.8.8 -> 0.2.8.9
Fixes a security hole that could be exploited for a denial of service
attack against a tor client, relay, hidden service, or authority [1].

[1]: https://trac.torproject.org/projects/tor/ticket/20384
2016-10-18 00:44:41 +02:00
Vladimír Čunát
6eeea6effd Python: more evaluation fixups. 2016-10-14 00:03:12 +02:00
Joachim Fasting
f0c85376b2
tor: 0.2.8.7 -> 0.2.8.8
Fixes two crashing bugs, nothing else of note.
2016-09-24 15:47:28 +02:00
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
5a2dbb1b8b
tor: 0.2.7.6 -> 0.2.8.7
Also:
- Turn patchPhase into postPatch
- Add systemd and libcap on linux (and also pkgconfig for detection);
  we should be able to change the service unit to Type=notify
- Disable checks for now, the test-suite is failing in sandbox due to
  lack of network
2016-08-26 17:18:56 +02: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
Tuomas Tynkkynen
bac26e08db Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03: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
3994a236bb
tor-arm: build recipe improvements
- Fix install of man page
- Remove redundant for loop
- Access python interpreter via pythonPackages
- Remove redundant build inputs (captured via replacement anyway)
- Fix install location of sample rc file.  For whatever reason, the
  install script ends up thinking it needs to use tor-arm, so override
  it
- Clarify meta.description
2016-04-30 22:25:46 +02:00
Joachim Fasting
61f110e890
tor: meta improvements 2016-04-30 18:53:42 +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
Vladimír Čunát
ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +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
Vladimír Čunát
09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Franz Pletz
ffef91e914 torbrowser: 5.5 -> 5.5.2 2016-02-15 03:54:44 +01:00
Vladimír Čunát
d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Vladimír Čunát
ae74c356d9 Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +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
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +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
Vladimír Čunát
f9f6f41bff Merge branch 'master' into closure-size
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Domen Kožar
c953334c75 Merge pull request #11972 from codsl/tor-0.2.7.6
tor: 0.2.7.5 -> 0.2.7.6
2015-12-28 23:27:29 +01:00
codsl
8fb46420ef torbrowser: 5.0.4 -> 5.0.6 2015-12-27 09:31:23 +00:00
codsl
42557425bc tor: 0.2.7.5 -> 0.2.7.6 2015-12-27 07:20:14 +00:00
John Wiegley
2cd323a51a tor: Allow building on Darwin 2015-12-16 14:10:31 -08:00
Luca Bruno
5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
codsl
7884923ba3 tor: 0.2.6.10 -> 0.2.7.5, fixes #11489 2015-12-06 13:18:45 +01:00
Vladimír Čunát
333d69a5f0 Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
ruebezahl
0069867c51 update 5.0.3 -> 5.0.4 2015-11-08 18:07:02 +01:00
Vladimír Čunát
91407a8bdf ncurses: split into multiple outputs
Some programs (e.g. tput) might better be moved somewhere else than
$dev/bin, but that can be improved later if need be.
2015-10-13 20:18:44 +02: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