git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #58213 from oxij/pkgs/tor-browser-update

firefoxPackages.tor-browser: 8.0.6 -> 8.0.8

commit8a5317f25bf4ee6776c97112ab9801ff75972846 authorJoachim F <joachifm@users.noreply.github.com> dateSun 24 Mar 2019, 20:11 (8 years ago) parentfc47b40e975d05
3 files changed+8−8
pkgs/applications/networking/browsers/firefox/common.nix+2 pkgs/applications/networking/browsers/firefox/packages.nix+5−5 pkgs/applications/networking/browsers/tor-browser-bundle/default.nix+1−3
pkgs/applications/networking/browsers/firefox/common.nix+2
@@ -251,8 +251,10 @@ stdenv.mkDerivation rec {
251251 # and wants these
252252 ++ lib.optionals isTorBrowserLike ([
253253 "--with-tor-browser-version=${tbversion}"
254+ "--with-distribution-id=org.torproject"
254255 "--enable-signmar"
255256 "--enable-verify-mar"
257+ "--enable-bundled-fonts"
256258 ])
257259
258260 ++ flag alsaSupport "alsa"
pkgs/applications/networking/browsers/firefox/packages.nix+5−5
@@ -232,16 +232,16 @@ in rec {
232232 };
233233
234234 tor-browser-8-0 = tbcommon rec {
235− ffversion = "60.5.1esr";
236− tbversion = "8.0.6";
235+ ffversion = "60.6.1esr";
236+ tbversion = "8.0.8";
237237
238238 # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb
239239 src = fetchFromGitHub {
240240 owner = "SLNOS";
241241 repo = "tor-browser";
242− # branch "tor-browser-60.5.1esr-8.0-1-slnos"
243− rev = "89be91fc7cbc420b7c4a3bfc36d2b0d500dd3ccf";
244− sha256 = "022zjfwsdl0dkg6ck2kha4nf91xm3j9ag5n21zna98szg3x82dj1";
242+ # branch "tor-browser-60.6.1esr-8.0-1-slnos"
243+ rev = "dda14213c550afc522ef0bb0bb1643289c298736";
244+ sha256 = "0lj79nczcix9mx6d0isbizg0f8apf6vgkp7r0q7id92691frj7fz";
245245 };
246246 };
247247
pkgs/applications/networking/browsers/tor-browser-bundle/default.nix+1−3
@@ -340,9 +340,7 @@ stdenv.mkDerivation rec {
340340 `tor-browser-bundle` needs for the bundling using a much simpler patch. See the
341341 longDescription and expression of the `firefoxPackages.tor-browser` package for more info.
342342 '';
343− homepage = https://torproject.org/;
344− license = licenses.free;
345− platforms = [ "x86_64-linux" ];
343+ inherit (tor-browser-unwrapped.meta) homepage platforms license;
346344 hydraPlatforms = [ ];
347345 maintainers = with maintainers; [ joachifm ];
348346 };