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: 6f61113415bb
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 48e29aa8d8e3
Choose a head ref
  • 4 commits
  • 3 files changed
  • 3 contributors

Commits on Jan 27, 2020

  1. chromium: 79.0.3945.88 -> 79.0.3945.117 

    CVE-TBD: Use after free in audio

https://chromereleases.googleblog.com/2020/01/stable-channel-update-for-desktop.html
(cherry picked from commit b8fa6dd)
    @ivan @primeos
    ivan authored and primeos committed Jan 27, 2020
    Copy the full SHA
    330781f View commit details

  2. chromium: 79.0.3945.117 -> 79.0.3945.130 

    https://chromereleases.googleblog.com/2020/01/stable-channel-update-for-desktop_16.html

This update includes 11 security fixes.

CVEs: CVE-2020-6378 CVE-2020-6379 CVE-2020-6380 CVE-2020-0601
(cherry picked from commit cccfd10)
    @primeos
    primeos committed Jan 27, 2020
    Copy the full SHA
    e7c07cc View commit details

  3. chromium: fix aarch64 build 

    The skia patch no longer applies, and is no longer necessary.

The current version of chromium doesn't build with gcc. This has been
fixed upstream[1] and could be backported, but switching aarch64 to
clang/llvm and making the build the same on all platforms is simpler.

[1] https://chromium.googlesource.com/chromium/src/+/9662ec844017690d5fd56bf0f05ef6a540dd29c1

(cherry picked from commit 6ec5e74)
    @thefloweringash @primeos
    thefloweringash authored and primeos committed Jan 27, 2020
    Copy the full SHA
    1f9158a View commit details

Commits on Jan 31, 2020

  1. Merge pull request #78603 from primeos/chromium-backport 

    [19.09] chromium: 79.0.3945.88 -> 79.0.3945.130 (backport)
    @primeos
    primeos authored Jan 31, 2020
    Copy the full SHA
    48e29aa View commit details
6 changes: 1 addition & 5 deletions pkgs/applications/networking/browsers/chromium/common.nix
View file
Original file line number Diff line number Diff line change
@@ -140,11 +140,7 @@ let
] ++ optionals (useVaapi) [
# source: https://aur.archlinux.org/cgit/aur.git/tree/vaapi-fix.patch?h=chromium-vaapi
./patches/vaapi-fix.patch
] ++ optional stdenv.isAarch64 (fetchpatch {
url = https://raw.githubusercontent.com/OSSystems/meta-browser/e4a667deaaf9a26a3a1aeb355770d1f29da549ad/recipes-browser/chromium/files/aarch64-skia-build-fix.patch;
postFetch = "substituteInPlace $out --replace __aarch64__ SK_CPU_ARM64";
sha256 = "018fbdzyw9rvia8m0qkk5gv8q8gl7x34rrjbn7mi1fgxdsayn22s";
});
];

postPatch = ''
# We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX
9 changes: 3 additions & 6 deletions pkgs/applications/networking/browsers/chromium/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ newScope, config, stdenv, llvmPackages, gcc8Stdenv, llvmPackages_8
{ newScope, config, stdenv, llvmPackages_8
, makeWrapper, ed
, glib, gtk3, gnome3, gsettings-desktop-schemas
, libva ? null
@@ -20,11 +20,8 @@
}:

let
stdenv_ = if stdenv.isAarch64 then gcc8Stdenv else llvmPackages_8.stdenv;
llvmPackages_ = if stdenv.isAarch64 then llvmPackages else llvmPackages_8;
in let
stdenv = stdenv_;
llvmPackages = llvmPackages_;
stdenv = llvmPackages_8.stdenv;
llvmPackages = llvmPackages_8;

callPackage = newScope chromium;

18 changes: 9 additions & 9 deletions pkgs/applications/networking/browsers/chromium/upstream-info.nix
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
{
beta = {
sha256 = "1j9zfbyil16yhf6hzrd0ssy9k49jx468dbmgzhc20l1548fif62g";
sha256bin64 = "1jfsswjqzdif6824p9a6raw5j9309y61c80kgfq23247vr514ky9";
version = "79.0.3945.88";
sha256 = "07h3znqb1r8hgcxzm5f04xkj2r66s1rhixqyyxi4hadf7qjx02n7";
sha256bin64 = "0r7706gxdqws8dm5859869p5h8gas6f65qz674rk18l8dbg40fzw";
version = "80.0.3987.66";
};
dev = {
sha256 = "1fbs6llrhm9jkzmk3v3a84d9is6g96kysy91hvpb0bw8f7anl969";
sha256bin64 = "04fscphs4w6jb1kdc25jc568r3k4x3nmg0apggjfnbdwzb5zkmf2";
version = "80.0.3987.16";
sha256 = "1sm1ndq4y2d4fs4y9d5k4dcs6q2pqilv7b0ffx2nlazdrr73la3n";
sha256bin64 = "0kr49hvk0c6pmxpm94fscxvdd6whxz1x7ic27xk86csjpjz6s5dg";
version = "81.0.4033.2";
};
stable = {
sha256 = "1j9zfbyil16yhf6hzrd0ssy9k49jx468dbmgzhc20l1548fif62g";
sha256bin64 = "1k44fnn41n73j1lff4h8s8f79pw8w180n467lwff4g9izh6c2blz";
version = "79.0.3945.88";
sha256 = "183vz3lf1588cr9s5vlnj65qvbmz36s8cg8k7dvr64cxmcqk86an";
sha256bin64 = "1550fs4n3lgvb80hij2yq13zkw0bjih210ylpd74n1mw9yw4ygk1";
version = "79.0.3945.130";
};
}