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

Commits on Jun 5, 2019

  1. chromium: use LLVM 8.0.0 to more closely match upstream

    @ivan
    ivan committed Jun 5, 2019
    Copy the full SHA
    4481a01 View commit details

  2. chromium: 74.0.3729.157 -> 75.0.3770.80 

    CVE-2019-5828 CVE-2019-5829 CVE-2019-5830 CVE-2019-5831
CVE-2019-5832 CVE-2019-5833 CVE-2019-5834 CVE-2019-5835
CVE-2019-5836 CVE-2019-5837 CVE-2019-5838 CVE-2019-5839
CVE-2019-5840

Update a patch for Python 3, fixes #62347.

Update a GN arg to fix this warning:

warning: The GN arg 'remove_webcore_debug_symbols' is deprecated and
warning: will be removed April 15, 2019. Please change your args.gn
warning: to use 'blink_symbol_level = 0'. https://crbug.com/943869
    @ivan
    ivan committed Jun 5, 2019
    Copy the full SHA
    8c78ae2 View commit details

  3. Merge pull request #62720 from ivan/chromium-75.0.3770.80 

    chromium: 74.0.3729.157 -> 75.0.3770.80
    @andir
    andir authored Jun 5, 2019
    Copy the full SHA
    86d2752 View commit details
2 changes: 1 addition & 1 deletion pkgs/applications/networking/browsers/chromium/common.nix
View file
Original file line number Diff line number Diff line change
@@ -250,7 +250,7 @@ let
treat_warnings_as_errors = false;
is_clang = stdenv.cc.isClang;
clang_use_chrome_plugins = false;
remove_webcore_debug_symbols = true;
blink_symbol_level = 0;
enable_swiftshader = false;
fieldtrial_testing_like_official_build = true;

6 changes: 3 additions & 3 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_7
{ newScope, config, stdenv, llvmPackages, gcc8Stdenv, llvmPackages_8
, makeWrapper, makeDesktopItem, ed
, glib, gtk3, gnome3, gsettings-desktop-schemas
, libva ? null
@@ -18,8 +18,8 @@
}:

let
stdenv_ = if stdenv.isAarch64 then gcc8Stdenv else llvmPackages_7.stdenv;
llvmPackages_ = if stdenv.isAarch64 then llvmPackages else llvmPackages_7;
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_;
2 changes: 1 addition & 1 deletion pkgs/applications/networking/browsers/chromium/patches/no-build-timestamps.patch
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
+ # I don't trust LASTCHANGE magic, and I definelly want something deterministic here
+ SOURCE_DATE_EPOCH = os.getenv("SOURCE_DATE_EPOCH", None)
+ if SOURCE_DATE_EPOCH is not None:
+ print SOURCE_DATE_EPOCH
+ print(SOURCE_DATE_EPOCH)
+ return 0
+ else:
+ raise RuntimeError("SOURCE_DATE_EPOCH not set")
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 = "01sw6ql4fr1zwbw4l4c3xgmd3jqil9lgmpmlhfyj9ga4kp2qlnim";
sha256bin64 = "0xwxb54l1ylrckxd36pkzcla34d5hbnhxz3gkrv4id530l6ms6jh";
version = "75.0.3770.27";
sha256 = "1mk6gb3iif8i6zq41wjn3lhqqlqp1syzpav1nj0170l7v348p0ns";
sha256bin64 = "02zq7gy51nclfh8806yqv4713cpb4yamy0h7x1zgcd2rxvqm4v53";
version = "75.0.3770.80";
};
dev = {
sha256 = "0fq8sjyscz998ha4wnn4npr3bb4jslcjc1i7xgwz6bh4yhi1az4f";
sha256bin64 = "1yb6ff6bg662klki7dcrdaysmsnqrnlp8syxcvwl2rysswll3wyl";
version = "76.0.3788.1";
sha256 = "0h0dbmk8l45c61g8iiylfnw45rqyqwc40brphwksi6gsvwn2yw8h";
sha256bin64 = "0vrwsllnrcgdvsflncqhwyfbjiqcj0n3mxyyyalr8arvkpz5r5ai";
version = "76.0.3806.1";
};
stable = {
sha256 = "01ifjsss3nqr15xx2iqsiqgjq1xc07j7ljnapsb484m7dcfk3gnw";
sha256bin64 = "0zkv4x4vbra476c6wy4igp6k80r9ssb9632wsyrzjni9w3zk9qvy";
version = "74.0.3729.157";
sha256 = "1mk6gb3iif8i6zq41wjn3lhqqlqp1syzpav1nj0170l7v348p0ns";
sha256bin64 = "03agz2bl22cmwgdcni8lbzjrwpikg5caimh8ynmhnpy7q9r3zy2w";
version = "75.0.3770.80";
};
}