Skip to content

Commit

Permalink
Merge pull request #38765 from taku0/flashplayer-29.0.0.140
Browse files Browse the repository at this point in the history
flashplayer: 29.0.0.113 -> 29.0.0.140 [Critical security fixes]
(cherry picked from commit 896cc08)
  • Loading branch information
7c6f434c committed Apr 11, 2018
1 parent 7944954 commit 5e45362
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions pkgs/applications/networking/browsers/chromium/plugins.nix
Expand Up @@ -94,12 +94,12 @@ let

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

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

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

src = fetchurl {
url =
Expand All @@ -84,14 +84,14 @@ stdenv.mkDerivation rec {
sha256 =
if debug then
if arch == "x86_64" then
"15nkmnkh4w458n9yp0f54d48vzl8bk6zq3clws8jvd76aa0accl0"
"0bj0d899dswfbkbrm08c381yzm0hlqdv53sgbl2z9zj4x8rqyi3p"
else
"0v9iwnb00jl6s6a1b9cnmqflh50dhyhmlwckk8qv6vy77b2jdsk7"
"16as2dydgqip6qlg13jh83sd4lb2cgrny4ibqg7jlx1d1a1i0jwh"
else
if arch == "x86_64" then
"18cbalnyikb8g8fb861b9kbgsqwrin5k7gd5smz2czk73kmfrph4"
"10s6j5izsy2v2ljljcv2vk898jg9xmp6zqqazmj07zy7m5vywfi7"
else
"06djh4scz97r8h4bsd392paimpybd59q1chd86bdsybm1xkgicmy";
"0xk8a2brpzfxi87mqqfv8l5xi5j9x71cy0ik64dzwcq7ka16gpz1";
};

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

src = fetchurl {
url =
Expand All @@ -65,9 +65,9 @@ stdenv.mkDerivation rec {
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/29/flash_player_sa_linux.x86_64.tar.gz";
sha256 =
if debug then
"12ackbfyh83f3ggvr8gs88f002glrymh2s2pfb5srbgdajrh0cyc"
"1gvfm4z46m2y39fswpzhx18dlwcxwwy5mins3kx2m425dgp76zd5"
else
"17xwsw13bq5s6mq4r22zhw99dx5xswzz83m7lvd9gl9ih78w7348";
"08a21c0l47w97xhwiby8j5055kl37ld5insfd459gz92d3f145fl";
};

nativeBuildInputs = [ unzip ];
Expand Down

0 comments on commit 5e45362

Please sign in to comment.