Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 827142a7fa9a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d9487e8941fe
Choose a head ref
  • 4 commits
  • 2 files changed
  • 2 contributors

Commits on Dec 5, 2017

  1. Revert a part of "firefox: 56.0.2 -> 57.0" 

    This reverts a part of commit 559433d.

The problem with removing those options completely is that without them
tor-browser's config differs from the official config (which may or may
not be a problem for fingerprinting).
    @oxij
    SLNOS authored and oxij committed Dec 5, 2017
    Copy the full SHA
    3d8260f View commit details

  2. firefoxPackages: move old firefox flags under isTorBrowserLike

    @oxij
    SLNOS authored and oxij committed Dec 5, 2017
    Copy the full SHA
    d838fbe View commit details

  3. firefoxPackages: tor-browser: 52.3.0esr-7.0.1 -> 52.5.0esr-7.0-1 

    fixes that file:// vuln
    @oxij
    SLNOS authored and oxij committed Dec 5, 2017
    Copy the full SHA
    d0eed98 View commit details

  4. Merge pull request #32341 from oxij/pkg/tor-browser 

    firefoxPackages: tor-browser: 52.3.0esr-7.0.1 -> 52.5.0esr-7.0-1
    @Mic92
    Mic92 authored Dec 5, 2017

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d9487e8 View commit details
Showing with 11 additions and 6 deletions.
  1. +7 −3 pkgs/applications/networking/browsers/firefox/common.nix
  2. +4 −3 pkgs/applications/networking/browsers/firefox/packages.nix
10 changes: 7 additions & 3 deletions pkgs/applications/networking/browsers/firefox/common.nix
View file
Original file line number Diff line number Diff line change
@@ -29,9 +29,11 @@
# Set to `privacySupport` or `false`.

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

, safeBrowsingSupport ? false
, drmSupport ? false

## other
@@ -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"
@@ -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"
7 changes: 4 additions & 3 deletions pkgs/applications/networking/browsers/firefox/packages.nix
View file
Original file line number Diff line number Diff line change
@@ -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";
};
@@ -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 =