Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5d28c4805598
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6699933118d3
Choose a head ref
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on Aug 17, 2018

  1. flash: 30.0.0.134 -> 30.0.0.154

    @kalbasit @Mic92
    kalbasit authored and Mic92 committed Aug 17, 2018
    Copy the full SHA
    6699933 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/networking/browsers/chromium/plugins.nix
View file
Original file line number Diff line number Diff line change
@@ -98,11 +98,11 @@ let

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

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

10 changes: 5 additions & 5 deletions pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
View file
Original file line number Diff line number Diff line change
@@ -73,7 +73,7 @@ let
in
stdenv.mkDerivation rec {
name = "flashplayer-${version}";
version = "30.0.0.134";
version = "30.0.0.154";

src = fetchurl {
url =
@@ -84,14 +84,14 @@ stdenv.mkDerivation rec {
sha256 =
if debug then
if arch == "x86_64" then
"1xa2mcbcxpfrqdf37a98nvvsvyp0bm3lsv21ky3ps9cba8a13z80"
"04hfh0vn1n70gdpfydq0sj94d6rkbk80h4pmy3rsfvhg0x540wx8"
else
"1jgl57ggcszdim51dcr0gsjmrdb2kdvxl0lv5zl83cvxcyz0z4p6"
"073327sszbvkglh5b18axmwv40sy2vyacdhcd1fx82qskv44sfda"
else
if arch == "x86_64" then
"0331r5af4zrvwc4h7dp5qyy91dfam5z03yjggls3x04i10nz5myw"
"03ypgzy88ck5rn1q971v0km9yw3p10ly1zkxh239v6nx0hs35w84"
else
"011cf0kycs4ih45l23bp6rr2vm7w7jaj4pjvmqwjax4xrb5pzkic";
"0rld7i659ccp4gvcvdkqkc1lajvlss5d4qndzf9aqiksvdknv62x";
};

nativeBuildInputs = [ unzip ];
6 changes: 3 additions & 3 deletions pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
View file
Original file line number Diff line number Diff line change
@@ -55,7 +55,7 @@ let
in
stdenv.mkDerivation rec {
name = "flashplayer-standalone-${version}";
version = "30.0.0.134";
version = "30.0.0.154";

src = fetchurl {
url =
@@ -65,9 +65,9 @@ stdenv.mkDerivation rec {
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/30/flash_player_sa_linux.x86_64.tar.gz";
sha256 =
if debug then
"1plmhv1799j0habmyxy7zhvilh823djmg4i387s6qifr5iv66pax"
"133zhgc5fh6s0xr93lv70xcrgvaj7lhjxk5w7xz79h3mp185p3g4"
else
"13cb7sca5mw5b1iiimyxbfxwpmdh7aya8rnlhkv3fgk5a1jwrxqr";
"1xz1l5q0zahalh0l4mkrwhmfrmcli3sckg3rcfnllizq9rbfzcmr";
};

nativeBuildInputs = [ unzip ];