diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-13 19:34:19 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-13 19:34:19 +0200 |
commit | 3e31d23d994b94b9883a39037e328c026491b999 (patch) | |
tree | aa5fec3413ae5b31a32ce37423ed677206121883 /pkgs/applications/networking/browsers | |
parent | 0a7741110ca7ceba76d4d0a7a83dbd823c3c7cf4 (diff) | |
parent | 2c07921cff84dfb0b9e0f6c2d10ee2bfee6a85ac (diff) | |
download | nixlib-3e31d23d994b94b9883a39037e328c026491b999.tar nixlib-3e31d23d994b94b9883a39037e328c026491b999.tar.gz nixlib-3e31d23d994b94b9883a39037e328c026491b999.tar.bz2 nixlib-3e31d23d994b94b9883a39037e328c026491b999.tar.lz nixlib-3e31d23d994b94b9883a39037e328c026491b999.tar.xz nixlib-3e31d23d994b94b9883a39037e328c026491b999.tar.zst nixlib-3e31d23d994b94b9883a39037e328c026491b999.zip |
Merge master into staging
Diffstat (limited to 'pkgs/applications/networking/browsers')
5 files changed, 14 insertions, 15 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index 70d457028292..775ae960eb7d 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -98,12 +98,11 @@ let flash = stdenv.mkDerivation rec { name = "flashplayer-ppapi-${version}"; - version = "30.0.0.113"; + version = "30.0.0.134"; src = fetchzip { - url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/" - + "${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "0bcsrsz2dd12xs9vn2977k4s6hag1cknkrsgxz3c9pxk4jz99f3k"; + url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; + sha256 = "1g6695w1ijqs8jbkbrb403ca1vvrf298ayvxslrvk70x6l7lp2ys"; 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 507697f0c2c3..78e410cda0fc 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 = "30.0.0.113"; + version = "30.0.0.134"; src = fetchurl { url = @@ -84,14 +84,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "1s4i9lmlydm8b373pi8jw5xf3fhcq75fgqyp7xd7aava8hay7x0j" + "1ld9ldsqd5vgghpidskxqmlz8gwdyf3mi3wmfdiaabdjxgzbg8sk" else - "1jhzvrn6f9zcynx3zq0vxidaps946aymm7l16c42p1f7q9s8msb4" + "1n96rx95spj4r34amapqr1i1klhv944fpvhdmn7gqjawr2hf36js" else if arch == "x86_64" then - "05dv4cn9i3zz5fmy16dxs9m1rpvlaih4gzsrf0q1zfjn46jbyw2l" + "0331r5af4zrvwc4h7dp5qyy91dfam5z03yjggls3x04i10nz5myw" else - "0pn159rzx6nb6lmkghccl0ynnc9ihfbr4rvfp14gm4n6jzbl6vg8"; + "01ibzqzlscpkfqp33bx7qcpz6gfqp4dq9ny3zasvjhi5xqd78j1k"; }; 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 8664b20e82d7..563c8db418d4 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 = "30.0.0.113"; + version = "30.0.0.134"; 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 - "0vdzmk9l04jq9mfkdddsqrga7ndikq910indl7wa3vndghrahmn0" + "0snkhs9w192azgv3nykxmgb47z395yrx7faxshasmc7abvvnfpx1" else - "10rm48i3h6x1dygjivv2mvd0jq6n40j5c2ik090s7i0ily5z97m8"; + "1wgcsbm9w46sp8347agd5m05x3xrki8vi6pf208ifihljw04hbx3"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 4e0f362360df..47a273e99f98 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -28,12 +28,12 @@ let in python3Packages.buildPythonApplication rec { pname = "qutebrowser"; - version = "1.4.0"; + version = "1.4.1"; # the release tarballs are different from the git checkout! src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "169xgwizw9kpdg0xll5jrxkb1k107cl4j1zx3jhmpsfbgykcnxpz"; + sha256 = "0n2z92vb91gpfchdm9wsm712r9grbvxwdp4npl5c1nbq247dxwm3"; }; # Needs tox diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix index 65ebaa3f80c5..031c520275fe 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix @@ -340,7 +340,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An unofficial version of the tor browser bundle, built from source"; homepage = https://torproject.org/; - license = licenses.unfreeRedistributable; # TODO: check this + license = licenses.free; platforms = [ "x86_64-linux" ]; hydraPlatforms = [ ]; maintainers = with maintainers; [ joachifm ]; |