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: 0e28092a561f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 497872c29452
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 7, 2019

  1. tor-browser-bundle: 8.5 -> 8.5.1, security fix! 

    I think the source variant needs special handling, sorry.
    @dtzWill
    dtzWill committed Jun 7, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    andir Andreas Rammhold
    GPG key ID: E432E410B5E48C86
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    88dc069 View commit details

Commits on Jun 8, 2019

  1. Merge pull request #62803 from dtzWill/update/tor-browser-bundle-8.5.1 

    tor-browser-bundle: 8.5 -> 8.5.1, security fix!
    @joachifm
    joachifm authored Jun 8, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    andir Andreas Rammhold
    GPG key ID: E432E410B5E48C86
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    497872c View commit details
Showing with 4 additions and 4 deletions.
  1. +1 −1 pkgs/applications/networking/browsers/firefox/packages.nix
  2. +3 −3 pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
2 changes: 1 addition & 1 deletion pkgs/applications/networking/browsers/firefox/packages.nix
View file
Original file line number Diff line number Diff line change
@@ -246,7 +246,7 @@ in rec {

tor-browser-8-5 = tbcommon rec {
ffversion = "60.7.0esr";
tbversion = "8.5.0";
tbversion = "8.5.0"; # TODO: update to match binary bundle (8.5.1 currently)

# FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb
src = fetchFromGitHub {
6 changes: 3 additions & 3 deletions pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
View file
Original file line number Diff line number Diff line change
@@ -89,7 +89,7 @@ let
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];

# Upstream source
version = "8.5";
version = "8.5.1";

lang = "en-US";

@@ -99,15 +99,15 @@ 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 = "09ixdq4n41cf5f3agmam3n669fflz6vwpalxpai07p2alal80g2x";
sha256 = "1mi587rh63ylhww0l8rr58qwbh9h7sk0c666mf84xk5b10s77hjb";
};

"i686-linux" = fetchurl {
urls = [
"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 = "0lgxwb8hll29sk7rpnraw9gfz7f9sb81gjsbxdnmm34y1vrabjv7";
sha256 = "0lgxwb9hll29sk7rpnraw9gfz7f9sb81gjsbxdnmm34y1vrabjv7";
};
};
in