From 8d77a34ad4c8a0fe3194dafccedea93ad39b682d Mon Sep 17 00:00:00 2001 From: SLNOS Date: Fri, 15 Mar 2019 00:00:00 +0000 Subject: [PATCH 1/6] firefoxPackages.tor-browser: 8.0.6 -> 8.0.8 (cherry picked from commit 6ed479de0c0980760d487187e7017f61c0b8a91a) --- .../networking/browsers/firefox/packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index c5bd0239527a..45312e3ff7b0 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -237,16 +237,16 @@ in rec { }; tor-browser-8-0 = tbcommon rec { - ffversion = "60.5.1esr"; - tbversion = "8.0.6"; + ffversion = "60.6.1esr"; + tbversion = "8.0.8"; # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb src = fetchFromGitHub { owner = "SLNOS"; repo = "tor-browser"; - # branch "tor-browser-60.5.1esr-8.0-1-slnos" - rev = "89be91fc7cbc420b7c4a3bfc36d2b0d500dd3ccf"; - sha256 = "022zjfwsdl0dkg6ck2kha4nf91xm3j9ag5n21zna98szg3x82dj1"; + # branch "tor-browser-60.6.1esr-8.0-1-slnos" + rev = "dda14213c550afc522ef0bb0bb1643289c298736"; + sha256 = "0lj79nczcix9mx6d0isbizg0f8apf6vgkp7r0q7id92691frj7fz"; }; }; From 7471a5cbea8f2bef61c15c702b5c03263be89e97 Mon Sep 17 00:00:00 2001 From: SLNOS Date: Fri, 15 Mar 2019 00:00:00 +0000 Subject: [PATCH 2/6] firefoxPackages.tor-browser: carry over more configureFlags from upstream These are taken from `tor-browser-build.git` repository. (cherry picked from commit ec4a7a02cabc2841333e60d5ab7270c86cc89cde) --- pkgs/applications/networking/browsers/firefox/common.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 54703f5a20f4..15de1a763d90 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -251,8 +251,10 @@ stdenv.mkDerivation rec { # and wants these ++ lib.optionals isTorBrowserLike ([ "--with-tor-browser-version=${tbversion}" + "--with-distribution-id=org.torproject" "--enable-signmar" "--enable-verify-mar" + "--enable-bundled-fonts" ]) ++ flag alsaSupport "alsa" From 5726f09740a683dd3e0236fc6c3892816e0b4b35 Mon Sep 17 00:00:00 2001 From: SLNOS Date: Wed, 1 May 2019 00:00:00 +0000 Subject: [PATCH 3/6] firefoxPackages.tor-browser: 8.0.8 -> 8.0.9 (cherry picked from commit 8b4d53168abd1c27e532c2708bebbfb33cd006a7) --- .../applications/networking/browsers/firefox/packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 45312e3ff7b0..f6eb4a668e85 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -238,15 +238,15 @@ in rec { tor-browser-8-0 = tbcommon rec { ffversion = "60.6.1esr"; - tbversion = "8.0.8"; + tbversion = "8.0.9"; # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb src = fetchFromGitHub { owner = "SLNOS"; repo = "tor-browser"; - # branch "tor-browser-60.6.1esr-8.0-1-slnos" - rev = "dda14213c550afc522ef0bb0bb1643289c298736"; - sha256 = "0lj79nczcix9mx6d0isbizg0f8apf6vgkp7r0q7id92691frj7fz"; + # branch "tor-browser-60.6.1esr-8.0-1-r2-slnos" + rev = "d311540ce07f1f4f5e5789f9107f6e6ecc23988d"; + sha256 = "0nz8vxv53vnqyk3ahakrr5xg6sgapvlmsb6s1pwwsb86fxk6pm5f"; }; }; From 30abdb8e38fd96714d1156047cd229398b5aa196 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 24 Mar 2019 18:37:32 +0000 Subject: [PATCH 4/6] tor-browser-bundle: inherit meta (cherry picked from commit e975d058cd310d71fdc2b1108a532d1d073f06f9) --- .../networking/browsers/tor-browser-bundle/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix index 8c8212e9e2c8..2c6940e037cd 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix @@ -340,9 +340,7 @@ stdenv.mkDerivation rec { `tor-browser-bundle` needs for the bundling using a much simpler patch. See the longDescription and expression of the `firefoxPackages.tor-browser` package for more info. ''; - homepage = https://torproject.org/; - license = licenses.free; - platforms = [ "x86_64-linux" ]; + inherit (tor-browser-unwrapped.meta) homepage platforms license; hydraPlatforms = [ ]; maintainers = with maintainers; [ joachifm ]; }; From 3c5ddf363a43974a9519b3acd72dba6262a3e41f Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 7 May 2019 09:39:23 +0200 Subject: [PATCH 5/6] tor-browser-bundle-bin: 8.0.8 -> 8.0.9 (cherry picked from commit 501c2c28a453b5d1732c92ea6b5d1f75d8878092) --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index f37677b05213..03bfbcb25cb4 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -89,7 +89,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "8.0.8"; + version = "8.0.9"; lang = "en-US"; @@ -99,7 +99,7 @@ let "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 = "14ckbhfiyv01cxnd98iihfz7xvrgcd5k4j7pn9ag4a6xb2l80sxi"; + sha256 = "0w11rnxpdql81gk618bmyrzl7q9ndyr5zps3cr9l331yhswq0sbc"; }; "i686-linux" = fetchurl { @@ -107,7 +107,7 @@ let "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 = "0g9sd104b6xnbl2j3gbq1ga6j2h0x3jccays0gpbd235bxpjs39a"; + sha256 = "02w1i6vi80ks5ch1pm1r426b9ip53fvg9qv9543r2dns4qzaf7zv"; }; }; in From c2f6e4ac0b77870eed1b80610a18bde0160caf1c Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 7 May 2019 09:39:33 +0200 Subject: [PATCH 6/6] tor-browser-bundle-bin: meta.homepage is a regular string (cherry picked from commit 7defc47944fe6d1da4c3a08c60c8332ca660a680) --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 03bfbcb25cb4..177b3c6e925a 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -389,7 +389,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tor Browser Bundle built by torproject.org"; longDescription = tor-browser-bundle.meta.longDescription; - homepage = https://www.torproject.org/; + homepage = "https://www.torproject.org/"; platforms = attrNames srcs; maintainers = with maintainers; [ offline matejc doublec thoughtpolice joachifm ]; hydraPlatforms = [];