public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #58213 from oxij/pkgs/tor-browser-update 

firefoxPackages.tor-browser: 8.0.6 -> 8.0.8
This commit is contained in:
Joachim F 2019-03-24 20:11:43 +00:00 committed by GitHub
parent fc47b4023c e975d058cd
commit 8a5317f25b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/networking/browsers/firefox/common.nix
View File

@ -251,8 +251,10 @@ stdenv.mkDerivation rec {
# and wants these # and wants these
++ lib.optionals isTorBrowserLike ([ ++ lib.optionals isTorBrowserLike ([
"--with-tor-browser-version=${tbversion}" "--with-tor-browser-version=${tbversion}"
"--with-distribution-id=org.torproject"
"--enable-signmar" "--enable-signmar"
"--enable-verify-mar" "--enable-verify-mar"
"--enable-bundled-fonts"
]) ])
++ flag alsaSupport "alsa" ++ flag alsaSupport "alsa"

10
pkgs/applications/networking/browsers/firefox/packages.nix
View File

@ -232,16 +232,16 @@ in rec {
}; };
tor-browser-8-0 = tbcommon rec { tor-browser-8-0 = tbcommon rec {
ffversion = "60.5.1esr"; ffversion = "60.6.1esr";
tbversion = "8.0.6"; tbversion = "8.0.8";
# FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "SLNOS"; owner = "SLNOS";
repo = "tor-browser"; repo = "tor-browser";
# branch "tor-browser-60.5.1esr-8.0-1-slnos" # branch "tor-browser-60.6.1esr-8.0-1-slnos"
rev = "89be91fc7cbc420b7c4a3bfc36d2b0d500dd3ccf"; rev = "dda14213c550afc522ef0bb0bb1643289c298736";
sha256 = "022zjfwsdl0dkg6ck2kha4nf91xm3j9ag5n21zna98szg3x82dj1"; sha256 = "0lj79nczcix9mx6d0isbizg0f8apf6vgkp7r0q7id92691frj7fz";
}; };
}; };

4
pkgs/applications/networking/browsers/tor-browser-bundle/default.nix
View File

@ -340,9 +340,7 @@ stdenv.mkDerivation rec {
`tor-browser-bundle` needs for the bundling using a much simpler patch. See the `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. longDescription and expression of the `firefoxPackages.tor-browser` package for more info.
''; '';
homepage = https://torproject.org/; inherit (tor-browser-unwrapped.meta) homepage platforms license;
license = licenses.free;
platforms = [ "x86_64-linux" ];
hydraPlatforms = [ ]; hydraPlatforms = [ ];
maintainers = with maintainers; [ joachifm ]; maintainers = with maintainers; [ joachifm ];
}; };