summary refs log tree commit diff
path: root/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2013-11-16 20:32:20 +0100
committerVladimír Čunát <vcunat@gmail.com>2013-11-16 20:32:44 +0100
commit68430cf3d7dae00f8eda1156de6b90243424e25a (patch)
tree4b008270a344486a20c8603047821923bf71e223 /pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
parent8e0d77632e02720a8adf8126f126990501299191 (diff)
parentb5356f7f275e6fb15c6fda0ce65de26de98a87d0 (diff)
downloadnixpkgs-68430cf3d7dae00f8eda1156de6b90243424e25a.tar
nixpkgs-68430cf3d7dae00f8eda1156de6b90243424e25a.tar.gz
nixpkgs-68430cf3d7dae00f8eda1156de6b90243424e25a.tar.bz2
nixpkgs-68430cf3d7dae00f8eda1156de6b90243424e25a.tar.lz
nixpkgs-68430cf3d7dae00f8eda1156de6b90243424e25a.tar.xz
nixpkgs-68430cf3d7dae00f8eda1156de6b90243424e25a.tar.zst
nixpkgs-68430cf3d7dae00f8eda1156de6b90243424e25a.zip
Merge branch master into x-updates
Conflicts (trivial, minor update on master, major here):
	pkgs/development/libraries/mesa/default.nix
Diffstat (limited to 'pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix')
-rw-r--r--pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
index 0363176257f..d4d95f7e5b9 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
@@ -44,9 +44,9 @@ let
         throw "no x86_64 debugging version available"
       else rec {
         # -> http://labs.adobe.com/downloads/flashplayer10.html
-        version = "11.2.202.297";
+        version = "11.2.202.310";
         url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz";
-        sha256 = "0jfigq56p6zp61pmc4jl12p8gv2jhfmim18j1b30iikw3iv26lh8";
+        sha256 = "03r9r7h3l4i15hw62k9il6pjzq122nldbgxr37b4y10xp08a9izj";
       }
     else if stdenv.system == "i686-linux" then
       if debug then {
@@ -55,9 +55,9 @@ let
         url = http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_plugin_debug.i386.tar.gz;
         sha256 = "1z3649lv9sh7jnwl8d90a293nkaswagj2ynhsr4xmwiy7c0jz2lk";
       } else rec {
-        version = "11.2.202.297";
+        version = "11.2.202.310";
         url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz";
-        sha256 = "0mpj25b2ar7gccqmw5lffdzlr3yyfalphpgwnl18s05wy1fx484y";
+        sha256 = "0qf09p92silp81pjfcg2vcfcfi1padizmb58q5iaarnapgkawlbh";
       }
     else throw "Flash Player is not supported on this platform";