Skip to content

Commit

Permalink
Merge pull request #36980 from taku0/flashplayer-29.0.0.113
Browse files Browse the repository at this point in the history
flashplayer: 28.0.0.161 -> 29.0.0.113
  • Loading branch information
7c6f434c committed Mar 14, 2018
2 parents 0077c76 + 864f4ce commit fabbf35
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions pkgs/applications/networking/browsers/chromium/plugins.nix
Expand Up @@ -98,12 +98,12 @@ let

flash = stdenv.mkDerivation rec {
name = "flashplayer-ppapi-${version}";
version = "28.0.0.161";
version = "29.0.0.113";

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

Expand Down
Expand Up @@ -73,25 +73,25 @@ let
in
stdenv.mkDerivation rec {
name = "flashplayer-${version}";
version = "28.0.0.161";
version = "29.0.0.113";

src = fetchurl {
url =
if debug then
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/28/flash_player_npapi_linux_debug.${arch}.tar.gz"
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/29/flash_player_npapi_linux_debug.${arch}.tar.gz"
else
"https://fpdownload.adobe.com/get/flashplayer/pdc/${version}/flash_player_npapi_linux.${arch}.tar.gz";
sha256 =
if debug then
if arch == "x86_64" then
"0dsgq39c2d0kkdcd9j4nddqn3qiq5pvm2r67ji4m4wyv9chn518m"
"15nkmnkh4w458n9yp0f54d48vzl8bk6zq3clws8jvd76aa0accl0"
else
"0x26qi9qr01rppji5l4nwvmrhmq6qy83dsppbb7jqjmgyvknq5jd"
"0v9iwnb00jl6s6a1b9cnmqflh50dhyhmlwckk8qv6vy77b2jdsk7"
else
if arch == "x86_64" then
"1s62gx2a9q962w3gc847x2xwlzkq4dkzbmvf74x5k5c2k2l9hhg0"
"18cbalnyikb8g8fb861b9kbgsqwrin5k7gd5smz2czk73kmfrph4"
else
"1m5pcgz2w9f3jkm3hpvysc8ap20y458xnba7j51d7h7fjy6md89x";
"06djh4scz97r8h4bsd392paimpybd59q1chd86bdsybm1xkgicmy";
};

nativeBuildInputs = [ unzip ];
Expand Down
Expand Up @@ -55,19 +55,19 @@ let
in
stdenv.mkDerivation rec {
name = "flashplayer-standalone-${version}";
version = "28.0.0.161";
version = "29.0.0.113";

src = fetchurl {
url =
if debug then
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/28/flash_player_sa_linux_debug.x86_64.tar.gz"
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/29/flash_player_sa_linux_debug.x86_64.tar.gz"
else
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/28/flash_player_sa_linux.x86_64.tar.gz";
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/29/flash_player_sa_linux.x86_64.tar.gz";
sha256 =
if debug then
"0934vs3c51fjz9pr846wg9xn7h2qybswayfkhz0pnzcfnng2rrf1"
"12ackbfyh83f3ggvr8gs88f002glrymh2s2pfb5srbgdajrh0cyc"
else
"0pwi7pbfldiqiwc7yfy7psyr93679r025vjxmiybs2ap69vly4v0";
"17xwsw13bq5s6mq4r22zhw99dx5xswzz83m7lvd9gl9ih78w7348";
};

nativeBuildInputs = [ unzip ];
Expand Down

0 comments on commit fabbf35

Please sign in to comment.