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: 8ceecf674fe9
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: cf018a7c5587
Choose a head ref
  • 3 commits
  • 4 files changed
  • 3 contributors

Commits on Sep 11, 2019

  1. youtube-dl: 2019.09.01 -> 2019.09.12 

    Signed-off-by: Roosembert Palacios <roosembert.palacios@epfl.ch>
(cherry picked from commit 2643692)
    @worldofpeace
    Roosembert Palacios authored and worldofpeace committed Sep 11, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    rasendubi Oleksii Shmalko
    GPG key ID: DCEF7BCCEB3066C3
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f6a38b8 View commit details

  2. youtube-dl: 2019.09.12 -> 2019.09.12.1 

    (cherry picked from commit 99ec641)
    @worldofpeace
    Averell Dalton authored and worldofpeace committed Sep 11, 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
    b8dc8b4 View commit details

  3. flashplayer: 32.0.0.238 -> 32.0.0.255 

    (cherry picked from commit dac3407)

 Conflicts:
	pkgs/applications/networking/browsers/chromium/plugins.nix
	pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
	pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
    @taku0 @veprbl
    taku0 authored and veprbl committed Sep 11, 2019
    Copy the full SHA
    cf018a7 View commit details
6 changes: 3 additions & 3 deletions pkgs/applications/networking/browsers/chromium/plugins.nix
View file
Original file line number Diff line number Diff line change
@@ -99,12 +99,12 @@ let
};

flash = stdenv.mkDerivation rec {
name = "flashplayer-ppapi-${version}";
version = "32.0.0.238";
pname = "flashplayer-ppapi";
version = "32.0.0.255";

src = fetchzip {
url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz";
sha256 = "0jqx68lfqjpy6wbxdi0giclvh9mc9rha92hqdj1nx42v95k3gc65";
sha256 = "1rqb54kqxq66vvqk5yrr3rsy3wcj9r9wnkngk27c7jayzm6bwgvv";
stripRoot = false;
};

12 changes: 6 additions & 6 deletions pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
View file
Original file line number Diff line number Diff line change
@@ -73,8 +73,8 @@ let
"";
in
stdenv.mkDerivation rec {
name = "flashplayer-${version}";
version = "32.0.0.238";
pname = "flashplayer";
version = "32.0.0.255";

src = fetchurl {
url =
@@ -85,14 +85,14 @@ stdenv.mkDerivation rec {
sha256 =
if debug then
if arch == "x86_64" then
"1f5i64nzkvxy20vi7kldaamwp6pi2zgmjiw061cgqrwf7hj45wkg"
"1hd5z8qmki36k2wdwgg3v4sj32g8590r5563gdrjrk7bmrqfjnji"
else
"09jvxqp83hpk89ak8flq14s3s3nhy3ary91jc6k47v325axh1cl9"
"0y13bxdgkxaqsyab09skiqj8dfjw76n2lr7p525ba8lbfbc8xj52"
else
if arch == "x86_64" then
"05gvssjdz43pvgivdngrf8qr5b30p45hr2sr97cyl6b87581qw9s"
"0qkslkaiw3c9xk1rjcl4x9d0fi6i91k7g01mf0gq28wgzcyz4cw7"
else
"06l7zhgh5rfxxw46b500zdgcqsk2h7kivng5b0b74s3vy7f0g270";
"0qblmaa3nq1g7825yhvz98pvd1591q3q7bsrhv5bbhdbmb9c1qd5";
};

nativeBuildInputs = [ unzip ];
8 changes: 4 additions & 4 deletions pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
View file
Original file line number Diff line number Diff line change
@@ -49,8 +49,8 @@
}:

stdenv.mkDerivation rec {
name = "flashplayer-standalone-${version}";
version = "32.0.0.238";
pname = "flashplayer-standalone";
version = "32.0.0.255";

src = fetchurl {
url =
@@ -60,9 +60,9 @@ stdenv.mkDerivation rec {
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz";
sha256 =
if debug then
"1vhfjpwsmg96irfvz81ldzn2m4qcjnql5psg4cifjay423yxabvy"
"1igc23mljmw1bw6fwx3rwpz7kxiy8n5znkng20w3yin2zh8qw8sy"
else
"0am95xi2jasvxj5b2i12wzpvl3bvxli537k1i04698cg0na6x0y0";
"0rfvgx1g0s8wswwpmfjx6p59yh1cxya3x3bczbissrq4rcb1v315";
};

nativeBuildInputs = [ unzip ];
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.09.01";
version = "2019.09.12.1";

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

nativeBuildInputs = [ makeWrapper ];