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

Commits on Jul 31, 2017

  1. torbrowser: 7.0.2 -> 7.0.3 

    Fixes a bug whereby visiting specially crafted urls could lead to
direct (non-tor) connections to the remote host[1]

[1]: https://blog.torproject.org/blog/tor-browser-703-released

(cherry picked from commit 449946e)
    @NeQuissimus @joachifm
    NeQuissimus authored and joachifm committed Jul 31, 2017
    Copy the full SHA
    fc91f39 View commit details

  2. electrum: 2.8.2 -> 2.8.3 

    (cherry picked from commit 9cee109)
    @joachifm
    joachifm committed Jul 31, 2017
    Copy the full SHA
    f39972b View commit details
Showing with 5 additions and 5 deletions.
  1. +2 −2 pkgs/applications/misc/electrum/default.nix
  2. +3 −3 pkgs/applications/networking/browsers/torbrowser/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/misc/electrum/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

python2Packages.buildPythonApplication rec {
name = "electrum-${version}";
version = "2.8.2";
version = "2.8.3";

src = fetchurl {
url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
sha256 = "01xphbi7lx64s9380zjfakz5h8blqmxp0ryqlll7px66qpmjn5fq";
sha256 = "04jswalydzwm16iismbq1h2shj17iq9sqm0mz8p98sh3dwkacvn1";
};

propagatedBuildInputs = with python2Packages; [
6 changes: 3 additions & 3 deletions pkgs/applications/networking/browsers/torbrowser/default.nix
View file
Original file line number Diff line number Diff line change
@@ -81,7 +81,7 @@ let
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];

# Upstream source
version = "7.0.2";
version = "7.0.3";

lang = "en-US";

@@ -91,15 +91,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 = "0xdw8mvyxz9vaxikzsj4ygzp36m4jfhvhqfiyaiiywpf39rqpkqr";
sha256 = "1p91szx60xx3295bpap9w2ydgaibj0yn9lbdyhajal35bbhjxqhc";
};

"i686-linux" = fetchurl {
urls = [
"https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
];
sha256 = "0m522i8zih5sj18dyzk9im7gmpmrbf96657v38m3pxn4ci38b83z";
sha256 = "0p51dxiq3qxyc5n7xvh1hq039pvp7z730f6dks4h5p3sfqw6isfp";
};
};
in