Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 303729afa024
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 86191b5b9132
Choose a head ref
  • 4 commits
  • 3 files changed
  • 4 contributors

Commits on Jun 21, 2019

  1. youtube-dl: 2019.06.08 -> 2019.06.21 (#63625) 

    Fixes yet another youtube issue.

(cherry picked from commit d3939637e4c9071aa35a0fbf7c4eb7c99fadd2e1)
    @timokau
    timokau authored Jun 21, 2019
    Copy the full SHA
    ea18186 View commit details

  2. tor-browser-bundle-bin: 32bit hashfix 

    (cherry picked from commit f46793a)
    @dtzWill @joachifm
    dtzWill authored and joachifm committed Jun 21, 2019
    Copy the full SHA
    552ee0a View commit details

  3. tor-browser-bundle-bin: 8.5.1 -> 8.5.3 

    (cherry picked from commit 24434e8)
    @joachifm
    joachifm committed Jun 21, 2019

    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
    514c297 View commit details

  4. firefoxPackages.tor-browser: 8.5.0 -> 8.5.2 

    (cherry picked from commit 2cec4ca)
    @joachifm
    SLNOS authored and joachifm committed Jun 21, 2019
    Copy the full SHA
    86191b5 View commit details
8 changes: 4 additions & 4 deletions pkgs/applications/networking/browsers/firefox/packages.nix
View file
Original file line number Diff line number Diff line change
@@ -238,15 +238,15 @@ in rec {

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

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

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.1";
version = "8.5.3";

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 = "1mi587rh63ylhww0l8rr58qwbh9h7sk0c666mf84xk5b10s77hjb";
sha256 = "15ml0azc7imlfc2h88yxpxsyrf6pxxcd1si33bfbsjh17zw1282g";
};

"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 = "0lgxwb9hll29sk7rpnraw9gfz7f9sb81gjsbxdnmm34y1vrabjv7";
sha256 = "1zvcy44qx353qa5h90g0qigbp9xgaiq8s7a5wmhnfrfd2iw4ph7d";
};
};
in
4 changes: 2 additions & 2 deletions pkgs/tools/misc/youtube-dl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -19,11 +19,11 @@ buildPythonPackage rec {
# The websites youtube-dl deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
version = "2019.06.08";
version = "2019.06.21";

src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
sha256 = "0dq8k28bl48xrnzf3mpi7lwyfiq8v2f78sy6py4jbiynxh38ani7";
sha256 = "03a729198zzhixbn7xixi9bprmk3qqh5dsyh3dqhji6lmlijx1w5";
};

nativeBuildInputs = [ makeWrapper ];