nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-21 16:11:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #61436 from joachifm/tor-browser-release-19.03

Browse Source 
[Backport] Tor browser related stuff for 19.03
This commit is contained in:
Joachim F
2019-05-13 11:45:13 +00:00
committed by GitHub
parent 90be3405d9 c2f6e4ac0b
commit 7ec6169b88
4 changed files with 12 additions and 12 deletions
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
++ lib.optionals isTorBrowserLike ([
"--with-tor-browser-version=${tbversion}"
"--with-distribution-id=org.torproject"
"--enable-signmar"
"--enable-verify-mar"
"--enable-bundled-fonts"
])
++ flag alsaSupport "alsa"

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

@@ -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.9";
# 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-r2-slnos"
rev = "d311540ce07f1f4f5e5789f9107f6e6ecc23988d";
sha256 = "0nz8vxv53vnqyk3ahakrr5xg6sgapvlmsb6s1pwwsb86fxk6pm5f";
};
};

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

@@ -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
@@ -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 = [];

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
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 ];
};