Branch: refs/heads/release-16.03
Home: https://github.com/NixOS/nixpkgs
Commit: e38910e4560fa8ebaf541d997b52951532d863b2
https://github.com/NixOS/nixpkgs/commit/e38910e4560fa8ebaf541d997b52951532d863b2
Author: Mayeu - Cast <ma...@users.noreply.github.com>
Date: 2016-06-25 (Sat, 25 Jun 2016)
Changed paths:
M pkgs/tools/security/tor/torbrowser.nix
Log Message:
-----------
torbrowser: 5.5.5 -> 6.0 (#15854)
(cherry picked from commit 4e20fa47e09c82ca7a580dc8a437e36ca271a128)
Commit: 00d22e311ca2157a46d9674705ae506ad6087b07
https://github.com/NixOS/nixpkgs/commit/00d22e311ca2157a46d9674705ae506ad6087b07
Author: Joachim Fasting <joach...@fastmail.fm>
Date: 2016-06-25 (Sat, 25 Jun 2016)
Changed paths:
M pkgs/tools/security/tor/torbrowser.nix
Log Message:
-----------
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).
(cherry picked from commit 961164a8a7986041e5c1022888c9a6f4925135ff)
Commit: 52e07c5b919c458669bd52fa4ec3677a3ccedfa6
https://github.com/NixOS/nixpkgs/commit/52e07c5b919c458669bd52fa4ec3677a3ccedfa6
Author: Joachim Fasting <joach...@fastmail.fm>
Date: 2016-06-25 (Sat, 25 Jun 2016)
Changed paths:
M pkgs/tools/security/tor/torbrowser.nix
Log Message:
-----------
torbrowser: 6.0 -> 6.0.1
(cherry picked from commit 8fc6ca75a93671b9bb3ccfbb5cd9a68a48754064)
Commit: 8bf31d7d27cae435d7c1e9e0ccb0a320b424066f
https://github.com/NixOS/nixpkgs/commit/8bf31d7d27cae435d7c1e9e0ccb0a320b424066f
Author: Joachim Fasting <joach...@fastmail.fm>
Date: 2016-06-25 (Sat, 25 Jun 2016)
Changed paths:
M pkgs/tools/security/tor/torbrowser.nix
Log Message:
-----------
torbrowser: 6.0.1 -> 6.0.2
(cherry picked from commit 9675384c7b667267f822e3e95a31aedc09c029fe)
Compare: https://github.com/NixOS/nixpkgs/compare/eb840acd0b79...8bf31d7d27ca_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
