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: 6723d59ae929
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b5ca2368dc74
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 30, 2019

  1. firefoxPackages.tor-browser: 8.0.9 -> 8.5.0 

    Actually, more like -> 8.5.0.1 as this version is made against the
branch with the pending fixup patch applied.
    @oxij
    SLNOS authored and oxij committed May 30, 2019
    Copy the full SHA
    c4962cd View commit details

  2. Merge pull request #62257 from oxij/pkgs/tor-browser-85 

    firefoxPackages.tor-browser: 8.0.9 -> 8.5.0
    @joachifm
    joachifm authored May 30, 2019
    Copy the full SHA
    b5ca236 View commit details
Showing with 7 additions and 7 deletions.
  1. +7 −7 pkgs/applications/networking/browsers/firefox/packages.nix
14 changes: 7 additions & 7 deletions pkgs/applications/networking/browsers/firefox/packages.nix
View file
Original file line number Diff line number Diff line change
@@ -244,24 +244,24 @@ in rec {
gtk3Support = false;
};

tor-browser-8-0 = tbcommon rec {
ffversion = "60.6.1esr";
tbversion = "8.0.9";
tor-browser-8-5 = tbcommon rec {
ffversion = "60.7.0esr";
tbversion = "8.5.0";

# FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb
src = fetchFromGitHub {
owner = "SLNOS";
repo = "tor-browser";
# branch "tor-browser-60.6.1esr-8.0-1-r2-slnos"
rev = "d311540ce07f1f4f5e5789f9107f6e6ecc23988d";
sha256 = "0nz8vxv53vnqyk3ahakrr5xg6sgapvlmsb6s1pwwsb86fxk6pm5f";
# branch "tor-browser-60.7.0esr-8.5-1-slnos"
rev = "8c69066856962116205c5c7508a0991dfb8ccd11";
sha256 = "1dshn7g9y6233vdqidrkg886ad6qjnl13vz2382ymbx180r2j73k";
};

patches = [
missing-documentation-patch
];
};

tor-browser = tor-browser-8-0;
tor-browser = tor-browser-8-5;

})