diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-05-09 10:48:01 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-05-09 10:48:01 +0200 |
commit | a18b493e022a4d94916b2d73198b29ff1a241114 (patch) | |
tree | e6f69c279e63f753e958773e854caeb934ac770c /pkgs/applications/networking | |
parent | 8ff2dca3884b99799d90e0a025de59552161eebf (diff) | |
parent | 70963b382f3f820ba6d3bc3b3aaf50a2957ec1ff (diff) | |
download | nixpkgs-a18b493e022a4d94916b2d73198b29ff1a241114.tar nixpkgs-a18b493e022a4d94916b2d73198b29ff1a241114.tar.gz nixpkgs-a18b493e022a4d94916b2d73198b29ff1a241114.tar.bz2 nixpkgs-a18b493e022a4d94916b2d73198b29ff1a241114.tar.lz nixpkgs-a18b493e022a4d94916b2d73198b29ff1a241114.tar.xz nixpkgs-a18b493e022a4d94916b2d73198b29ff1a241114.tar.zst nixpkgs-a18b493e022a4d94916b2d73198b29ff1a241114.zip |
Merge master into staging
Diffstat (limited to 'pkgs/applications/networking')
3 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index f0862aebafe..cb2121553ac 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -98,12 +98,12 @@ let flash = stdenv.mkDerivation rec { name = "flashplayer-ppapi-${version}"; - version = "29.0.0.140"; + version = "29.0.0.171"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/" + "${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "1p0jr7s6vyzxw1mhbrl5yx092z2wpvfw0jjw127gs576z0zwamwh"; + sha256 = "1j7w81wjfrpkir11m719jdahnbnw4sph448hs90hvai6rsn3imib"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index 162dd88054c..6c19b684aaa 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -73,7 +73,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "29.0.0.140"; + version = "29.0.0.171"; src = fetchurl { url = @@ -84,14 +84,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "0bj0d899dswfbkbrm08c381yzm0hlqdv53sgbl2z9zj4x8rqyi3p" + "140galarr38lmfnd2chl2msvxizx96kdi000gbikir9xnd7bx1hc" else - "16as2dydgqip6qlg13jh83sd4lb2cgrny4ibqg7jlx1d1a1i0jwh" + "0wzmf12xrmyq8vqqyii932yx4nadrvkn2j9s86xcw67lb40xj5ig" else if arch == "x86_64" then - "10s6j5izsy2v2ljljcv2vk898jg9xmp6zqqazmj07zy7m5vywfi7" + "17c57xgs0w71p4xsjw5an7dg484769wanq3kx86ppaqw8vqhnqc3" else - "0xk8a2brpzfxi87mqqfv8l5xi5j9x71cy0ik64dzwcq7ka16gpz1"; + "06pjbc9050fgi2njzf9vm6py7c22i6chw852rbm8flx3cmplw23b"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index 42d7aa2f56f..fa9c89b442b 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -55,7 +55,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-standalone-${version}"; - version = "29.0.0.140"; + version = "29.0.0.171"; src = fetchurl { url = @@ -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 - "1gvfm4z46m2y39fswpzhx18dlwcxwwy5mins3kx2m425dgp76zd5" + "1q2lmsb9g2cxbwxb712javmadk6vmcgkihd244394nr10isdzw67" else - "08a21c0l47w97xhwiby8j5055kl37ld5insfd459gz92d3f145fl"; + "0qj5qdc9k53pgqxb5jpcbgfsgavmlyzp0cpz468c4zacsvxgq502"; }; nativeBuildInputs = [ unzip ]; |