diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-08-24 08:19:05 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-08-24 08:55:37 +0200 |
| commit | 2e6bf42a2207d5ecfe6e67de2def6e004a0eb1f1 (patch) | |
| tree | 36de0660dc2c9f3731bd8b60ec852ca0c452efce /pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix | |
| parent | 84a91208a948be5eca97ea182c4256d9d6ecf171 (diff) | |
| parent | 8943fb5f24b9e1aa1d577be4e214d166643269fd (diff) | |
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to name -> pname+version. Fortunately, almost everything was auto-resolved by kdiff3, and for now I just fixed up a couple evaluation problems, as verified by the tarball job. There might be some fallback to these conflicts, but I believe it should be minimal. Hydra nixpkgs: ?compare=1538299
Diffstat (limited to 'pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix')
| -rw-r--r-- | pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index e9431866047e3..2d2d2a6910069 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { pname = "flashplayer-standalone"; - version = "32.0.0.223"; + version = "32.0.0.238"; 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 - "1f3098vfznnx8d7rimgbalr2728jhzwca9val7pdi9b8yf9labwk" + "1vhfjpwsmg96irfvz81ldzn2m4qcjnql5psg4cifjay423yxabvy" else - "005iyajgp55ww25rcyxg5g0kbzddp6izfly9p4agahmzlzv18y4h"; + "0am95xi2jasvxj5b2i12wzpvl3bvxli537k1i04698cg0na6x0y0"; }; nativeBuildInputs = [ unzip ]; |