Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bae4d7daa01e
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2ce3a3d659d3
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 9, 2019

  1. tor-browser-bundle-bin: Drop github mirror 

    The github.com mirror for tor-browser hasn't been updated since
8.0.2, released in Oct 2018 (~11 months ago; currently latest
released version is 8.5.6):

https://github.com/TheTorProject/gettorbrowser/releases/
(cherry picked from commit 154c9a8)
    @hkjn @joachifm
    hkjn authored and joachifm committed Nov 9, 2019
    Copy the full SHA
    6f7dfa3 View commit details

  2. tor-browser-bundle-bin: 8.5.5 -> 9.0 

    https://blog.torproject.org/new-release-tor-browser-90
(cherry picked from commit 773fc55)
    @dtzWill @joachifm
    dtzWill authored and joachifm committed Nov 9, 2019
    Copy the full SHA
    2ce3a3d View commit details
Showing with 10 additions and 18 deletions.
  1. +10 −18 pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
28 changes: 10 additions & 18 deletions pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
View file
Original file line number Diff line number Diff line change
@@ -89,25 +89,19 @@ let
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];

# Upstream source
version = "8.5.5";
version = "9.0";

lang = "en-US";

srcs = {
x86_64-linux = fetchurl {
urls = [
"https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
];
sha256 = "00r5k9bbfpv3s6shxqypl13psr1zz51xiyz3vmm4flhr2qa4ycsz";
url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz";
sha256 = "0aajbk65lpcazn8mdk7ngaqp0sykql8zjlkhznphxxw9v59mq3b7";
};

i686-linux = fetchurl {
urls = [
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
"https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
];
sha256 = "1nxvw5kiggfr4n5an436ass84cvwjviaa894kfm72yf2ls149f29";
url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz";
sha256 = "08ahs9985ndcq1ywz06q4znai6a3ivibjk473kymzl6k40q1c9y2";
};
};
in
@@ -167,15 +161,12 @@ stdenv.mkDerivation rec {
# interpreter for pre-compiled Go binaries by invoking the interpreter
# directly.
sed -i TorBrowser/Data/Tor/torrc-defaults \
-e "s|\(ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit\) exec|\1 exec $interp|" \
-e "s|\(ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit\) exec|\1 exec $interp|"
# Fixup fte transport
#
# Note: the script adds its dirname to search path automatically
sed -i TorBrowser/Tor/PluggableTransports/fteproxy.bin \
-e "s,/usr/bin/env python,${python27.interpreter},"
# Similarly fixup snowflake
sed -i TorBrowser/Data/Tor/torrc-defaults \
-e "s|\(ClientTransportPlugin snowflake\) exec|\1 exec $interp|"
patchelf --set-rpath "${fteLibPath}" TorBrowser/Tor/PluggableTransports/fte/cDFA.so
# Prepare for autoconfig.
#
@@ -239,6 +230,7 @@ stdenv.mkDerivation rec {
# Preload extensions by moving into the runtime instead of storing under the
# user's profile directory.
mkdir -p "$TBB_IN_STORE/browser/extensions"
mv "$TBB_IN_STORE/TorBrowser/Data/Browser/profile.default/extensions/"* \
"$TBB_IN_STORE/browser/extensions"