From d18f4acdf1ee46102e7426b825f972b4454791d8 Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Fri, 14 Jun 2019 01:05:39 +0000 Subject: [PATCH 1/2] chromium: 75.0.3770.90 -> 76.0.3809.87 Fixed in 75.0.3770.142: CVE-2019-5847 CVE-2019-5848 Fixed in 76.0.3809.87: CVE-2019-5850 CVE-2019-5860 CVE-2019-5853 CVE-2019-5851 CVE-2019-5859 CVE-2019-5856 CVE-2019-5863 CVE-2019-5855 CVE-2019-5865 CVE-2019-5858 CVE-2019-5864 CVE-2019-5862 CVE-2019-5861 CVE-2019-5857 CVE-2019-5854 CVE-2019-5852 --- .../browsers/chromium/upstream-info.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 89d969587a1..d8d2aff0d09 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "0pq7q7plbmfg2f6m74wl2l19k15ik2mvw56bfzk4c9cdns8w6b8a"; - sha256bin64 = "09zf3kldvi8zh7arvl94vjmbvgsghwa51b5j0ic8ncdn880dlq0j"; - version = "76.0.3809.25"; + sha256 = "1521vh38mfgy7aj1lw1vpbdm8m6wyh52d5p7bz4x6kvvxsnacp11"; + sha256bin64 = "0rbc0ld655szg42mqjdby8749d2jg34nlpp4cpq66qb4zi6vvb04"; + version = "76.0.3809.87"; }; dev = { - sha256 = "19v1i4ks5rpwdcwmfj8qqni4afyhnddb5hbbisabnjif3b8xrvjw"; - sha256bin64 = "0vsbxvqidrvw797h0and67pdb4maijsiv6jkpj3kqaxakiwnadxj"; - version = "76.0.3809.21"; + sha256 = "15v25nwcdxqgw6n0ym7fz5qaq0a74p0wiwcq155xy6zvr3q8q1nw"; + sha256bin64 = "1qawl0hsl6qpc10avli8raw4nzwcpmp6dyada5pga7i4k5jpsr95"; + version = "77.0.3860.5"; }; stable = { - sha256 = "0f9qjhxvk8sajj7qa061crfmln65q7sniylrgp0qijwyw6xrmddi"; - sha256bin64 = "1xvqfrq119iwgvd2d4z2v2ladi2kl52kji55yxdmyi377dpk5rfa"; - version = "75.0.3770.90"; + sha256 = "1521vh38mfgy7aj1lw1vpbdm8m6wyh52d5p7bz4x6kvvxsnacp11"; + sha256bin64 = "0hnfn2zxdrp96a4p98r08w4krzwkpb1kp4rjk03754akjyg1b3xx"; + version = "76.0.3809.87"; }; } From a897743a135751150df3b96b1de8e3e079a616cf Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Wed, 31 Jul 2019 08:58:08 +0000 Subject: [PATCH 2/2] chromiumDev: fix build Fixes: ERROR Unresolved dependencies. //third_party/perfetto/gn:zlib(//build/toolchain/linux:clang_x64) needs //third_party/zlib:zlib_config(//build/toolchain/linux:clang_x64) builder for '/nix/store/iqr4vn2by1yxa7f92jiymvgfsn9mdvwq-chromium-unwrapped-77.0.3860.5.drv' failed with exit code 1 --- pkgs/applications/networking/browsers/chromium/common.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index ea0e0184340..3e63389be02 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -67,7 +67,8 @@ let in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs)); gnSystemLibraries = [ - "flac" "libwebp" "libxslt" "yasm" "opus" "snappy" "libpng" "zlib" + "flac" "libwebp" "libxslt" "yasm" "opus" "snappy" "libpng" + # "zlib" # version 77 reports unresolved dependency on //third_party/zlib:zlib_config # "libjpeg" # fails with multiple undefined references to chromium_jpeg_* # "re2" # fails with linker errors # "ffmpeg" # https://crbug.com/731766