Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3a10a004bb58
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: eabc31612eab
Choose a head ref
  • 11 commits
  • 10 files changed
  • 3 contributors

Commits on Oct 14, 2020

  1. firefox: 81.0 -> 81.0.2 

    (cherry picked from commit 05b955a)
    @taku0
    taku0 committed Oct 14, 2020
    Copy the full SHA
    e1c3cfe View commit details

  2. firefox-bin: 81.0 -> 81.0.2 

    (cherry picked from commit 68a9d42)
    @taku0
    taku0 committed Oct 14, 2020
    Copy the full SHA
    7c42577 View commit details

  3. firefox-esr: 78.3.0esr -> 78.3.1esr 

    (cherry picked from commit 560cc80)
    @taku0
    taku0 committed Oct 14, 2020
    Copy the full SHA
    9ce60fd View commit details

  4. flashplayer: 32.0.0.433 -> 32.0.0.445 

    (cherry picked from commit 52dcd5b)
(removed ungoogled-chromium)
    @taku0
    taku0 committed Oct 14, 2020
    Copy the full SHA
    51e920d View commit details

  5. Merge pull request #100458 from taku0/firefox-bin-81.0.2_release-20.03 

    [20.03] firefox, firefox-bin: 81.0 -> 81.0.2, firefox-esr: 78.3.0esr -> 78.3.1esr
    @garbas
    garbas authored Oct 14, 2020
    Copy the full SHA
    b7ae362 View commit details

  6. Merge pull request #100468 from taku0/flashplayer-32.0.0.445_release-… 

    …20.03

[20.03] flashplayer: 32.0.0.433 -> 32.0.0.445 (Critical security fix)
    @garbas
    garbas authored Oct 14, 2020
    Copy the full SHA
    c1e3ea8 View commit details

  7. linux: 4.14.200 -> 4.14.201

    @NeQuissimus
    NeQuissimus committed Oct 14, 2020
    Copy the full SHA
    f973d9f View commit details

  8. linux: 4.19.150 -> 4.19.151

    @NeQuissimus
    NeQuissimus committed Oct 14, 2020
    Copy the full SHA
    aecb627 View commit details

  9. linux: 4.4.238 -> 4.4.239

    @NeQuissimus
    NeQuissimus committed Oct 14, 2020
    Copy the full SHA
    33a72a3 View commit details

  10. linux: 4.9.238 -> 4.9.239

    @NeQuissimus
    NeQuissimus committed Oct 14, 2020
    Copy the full SHA
    6d16bb3 View commit details

  11. linux: 5.4.70 -> 5.4.71

    @NeQuissimus
    NeQuissimus committed Oct 14, 2020
    Copy the full SHA
    eabc316 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
@@ -45,11 +45,11 @@ let

flash = stdenv.mkDerivation rec {
pname = "flashplayer-ppapi";
version = "32.0.0.433";
version = "32.0.0.445";

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

770 changes: 385 additions & 385 deletions pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions pkgs/applications/networking/browsers/firefox/packages.nix
View file
Original file line number Diff line number Diff line change
@@ -7,10 +7,10 @@ in
rec {
firefox = common rec {
pname = "firefox";
ffversion = "81.0";
ffversion = "81.0.2";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "1dnxn754vb99mccqrj3wr3pg2scjy42rvs5xc6bw022gh6n8kgipx9pbkapwfivkglynxmmbw1k11ak34zhr1g6p31m3550ad6azq19";
sha512 = "1szsj7rwpn7ggiavvnc38a75ip0r3p5bgr2kvy2hq7519abzmr3z49jg4alpsy1ndkfylvh28zjw9h5xys0bvs40f33ps90j60z8gla";
};

patches = [
@@ -35,10 +35,10 @@ rec {

firefox-esr-78 = common rec {
pname = "firefox-esr";
ffversion = "78.3.0esr";
ffversion = "78.3.1esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "3rg4rjmigir2wsvzdl5dkh74hahjv36yvd04rhq0rszw6xz9wyig64nxhkrpf416z6iy3y1qavk7x9j6j02sc2f545pd6cx8abjgqc9";
sha512 = "10a7xfp396n81aj17fbl1b1jr8gbn5ild2ig5cfz6r5ff3wfbjs3x0iqrlwqnjfdqq2pw19k2yrv91iwymd8jwjj4p35xsfivgn0a0n";
};

patches = [
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
@@ -74,7 +74,7 @@ let
in
stdenv.mkDerivation rec {
pname = "flashplayer";
version = "32.0.0.433";
version = "32.0.0.445";

src = fetchurl {
url =
@@ -85,14 +85,14 @@ stdenv.mkDerivation rec {
sha256 =
if debug then
if arch == "x86_64" then
"18hr026743swpdjjk7cg3hnpw2ws3q246xnkb326lyvv90wqlfni"
"0jn1g8k8fkikhi0xlcsx5a43lxrj6ynwbxn55b17wacsqw20b9ii"
else
"1yhyirii6rmnk420imaa160r9akarb3jrrlyas5a8d2y65gya71g"
"104af8sy0qq45agg3lpjwn1cp8lhpcjiim6gqn4cymcfp8d7ngg0"
else
if arch == "x86_64" then
"0k80i98zkpf6r46y1aw2zg1dsgbirg6rc8q21vycpvln395jq0pf"
"1dd52nhnl3f1d7r82gq28scna5qr39gpfqkgrhzd6cxd2vnhnhjn"
else
"1qw6hjwv9y7qr333k4nlpd7fwyzbsk833sx2slfgjfhsbipr7p3r";
"09ayb637cyf5x06xmhvad2znss7ak7r4n8z3wq7qmn0pmjdsa5a3";
};

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
@@ -50,7 +50,7 @@

stdenv.mkDerivation {
pname = "flashplayer-standalone";
version = "32.0.0.433";
version = "32.0.0.445";

src = fetchurl {
url =
@@ -60,9 +60,9 @@ stdenv.mkDerivation {
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz";
sha256 =
if debug then
"1ys523wwhvj96jph435lnyp07qzg9f70j349l7ggwgg96rflalpf"
"0iqmdd222mjsf3rdbcm4z974i5q9y4i5agnhn039k0hpydi4zdcr"
else
"1ycw2amis7yvidc6q87gls6rb305p89pr7mhzknc10v0nh34781m";
"07vz17zhwh31phccpbmwgfa3fdb2f7bnc3sf66ipsw1xcqgncpsx";
};

nativeBuildInputs = [ unzip ];
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.14.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "4.14.200";
version = "4.14.201";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0f4sd4fqgm1wbhmrsib04ry5aza84mlc8747y5wm6jx34h14lh2x";
sha256 = "0nr3w5m7dz28v7qfhp99ih4c369qrhq751wfikbz8ga3di0dqa72";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.19.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "4.19.150";
version = "4.19.151";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1kmsrinhy67vh34m6z3xinwg3v6z8jm7v1asq6rqqkba13phkxzj";
sha256 = "0vm3nsi9la3azxrsvndbd6fpz79pch7309f2144xyxszsk339cf7";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.4.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:

buildLinux (args // rec {
version = "4.4.238";
version = "4.4.239";
extraMeta.branch = "4.4";

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0r1kb7p0zf0nkavvf9nr9hs7bdjym43cqv87hkp7vrqpbh1i8y06";
sha256 = "03myd9ngmjmnddh4iqqsgcfg9rd11vyvwym38yh4m1p08j1zbg0k";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.9.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:

buildLinux (args // rec {
version = "4.9.238";
version = "4.9.239";
extraMeta.branch = "4.9";

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0gsa2g5yjc7459ja107nla700ma32sg57dyj8q2xzi0yfw5zdsmi";
sha256 = "0lfbn5amykvwz1svvxayzhsz1dvm4mgzsnq1g0wqffclxm148hr3";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-5.4.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "5.4.70";
version = "5.4.71";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "01shqhibrxirl9bik8jwiag70n9n0l7782xh73gkb8jvbh4dicy0";
sha256 = "1ivcimngj5h7lxslkrdljpfw9hfvdhrm8wrp7gp4d3gk7kpljw3k";
};
} // (args.argsOverride or {}))