Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

firefoxPackages: tor-browser: 52.3.0esr-7.0.1 -> 52.5.0esr-7.0-1 #32341

Merged
merged 3 commits into from
Dec 5, 2017
Merged

firefoxPackages: tor-browser: 52.3.0esr-7.0.1 -> 52.5.0esr-7.0-1 #32341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d8260f
Revert a part of "firefox: 56.0.2 -> 57.0"
Nov 15, 2017
d838fbe
firefoxPackages: move old firefox flags under isTorBrowserLike
Nov 15, 2017
d0eed98
firefoxPackages: tor-browser: 52.3.0esr-7.0.1 -> 52.5.0esr-7.0-1
Nov 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 7 additions & 3 deletions pkgs/applications/networking/browsers/firefox/common.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,11 @@
# Set to `privacySupport` or `false`.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add an explanation in revert message?


, webrtcSupport ? !privacySupport
, googleAPISupport ? !privacySupport
, geolocationSupport ? !privacySupport
, googleAPISupport ? geolocationSupport
, crashreporterSupport ? false

, safeBrowsingSupport ? false
, drmSupport ? false

## other
Expand Down Expand Up @@ -141,7 +143,7 @@ stdenv.mkDerivation (rec {
]

# and wants these
++ lib.optionals isTorBrowserLike [
++ lib.optionals isTorBrowserLike ([
"--with-tor-browser-version=${version}"
"--enable-signmar"
"--enable-verify-mar"
Expand All @@ -151,7 +153,9 @@ stdenv.mkDerivation (rec {
# possibilities on other platforms.
# Lets save some space instead.
"--with-system-nspr"
]
] ++ flag geolocationSupport "mozril-geoloc"
++ flag safeBrowsingSupport "safe-browsing"
)

++ flag alsaSupport "alsa"
++ flag pulseaudioSupport "pulseaudio"
Expand Down
7 changes: 4 additions & 3 deletions pkgs/applications/networking/browsers/firefox/packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ in rec {
src = fetchFromGitHub {
owner = "SLNOS";
repo = "tor-browser";
# branch "tor-browser-45.8.0esr-6.5-2"
# branch "tor-browser-45.8.0esr-6.5-2-slnos"
rev = "e4140ea01b9906934f0347e95f860cec207ea824";
sha256 = "0a1qk3a9a3xxrl56bp4zbknbchv5x17k1w5kgcf4j3vklcv6av60";
};
Expand All @@ -128,8 +128,9 @@ in rec {
src = fetchFromGitHub {
owner = "SLNOS";
repo = "tor-browser";
rev = "tor-browser-52.3.0esr-7.0-1-slnos";
sha256 = "0szbf8gjbl4dnrb4igy4mq5858i1y6ki4skhdw63iqqdd8w9v4yv";
# branch "tor-browser-52.5.0esr-7.0-1-slnos";
rev = "830ff8d622ef20345d83f386174f790b0fc2440d";
sha256 = "169mjkr0bp80yv9nzza7kay7y2k03lpnx71h4ybcv9ygxgzdgax5";
};

patches =
Expand Down