Merge pull request #62720 from ivan/chromium-75.0.3770.80
chromium: 74.0.3729.157 -> 75.0.3770.80
This commit is contained in:
commit
86d2752677
@ -250,7 +250,7 @@ let
|
|||||||
treat_warnings_as_errors = false;
|
treat_warnings_as_errors = false;
|
||||||
is_clang = stdenv.cc.isClang;
|
is_clang = stdenv.cc.isClang;
|
||||||
clang_use_chrome_plugins = false;
|
clang_use_chrome_plugins = false;
|
||||||
remove_webcore_debug_symbols = true;
|
blink_symbol_level = 0;
|
||||||
enable_swiftshader = false;
|
enable_swiftshader = false;
|
||||||
fieldtrial_testing_like_official_build = true;
|
fieldtrial_testing_like_official_build = true;
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ newScope, config, stdenv, llvmPackages, gcc8Stdenv, llvmPackages_7
|
{ newScope, config, stdenv, llvmPackages, gcc8Stdenv, llvmPackages_8
|
||||||
, makeWrapper, makeDesktopItem, ed
|
, makeWrapper, makeDesktopItem, ed
|
||||||
, glib, gtk3, gnome3, gsettings-desktop-schemas
|
, glib, gtk3, gnome3, gsettings-desktop-schemas
|
||||||
, libva ? null
|
, libva ? null
|
||||||
@ -18,8 +18,8 @@
|
|||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
stdenv_ = if stdenv.isAarch64 then gcc8Stdenv else llvmPackages_7.stdenv;
|
stdenv_ = if stdenv.isAarch64 then gcc8Stdenv else llvmPackages_8.stdenv;
|
||||||
llvmPackages_ = if stdenv.isAarch64 then llvmPackages else llvmPackages_7;
|
llvmPackages_ = if stdenv.isAarch64 then llvmPackages else llvmPackages_8;
|
||||||
in let
|
in let
|
||||||
stdenv = stdenv_;
|
stdenv = stdenv_;
|
||||||
llvmPackages = llvmPackages_;
|
llvmPackages = llvmPackages_;
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
+ # I don't trust LASTCHANGE magic, and I definelly want something deterministic here
|
+ # I don't trust LASTCHANGE magic, and I definelly want something deterministic here
|
||||||
+ SOURCE_DATE_EPOCH = os.getenv("SOURCE_DATE_EPOCH", None)
|
+ SOURCE_DATE_EPOCH = os.getenv("SOURCE_DATE_EPOCH", None)
|
||||||
+ if SOURCE_DATE_EPOCH is not None:
|
+ if SOURCE_DATE_EPOCH is not None:
|
||||||
+ print SOURCE_DATE_EPOCH
|
+ print(SOURCE_DATE_EPOCH)
|
||||||
+ return 0
|
+ return 0
|
||||||
+ else:
|
+ else:
|
||||||
+ raise RuntimeError("SOURCE_DATE_EPOCH not set")
|
+ raise RuntimeError("SOURCE_DATE_EPOCH not set")
|
||||||
|
@ -1,18 +1,18 @@
|
|||||||
# This file is autogenerated from update.sh in the same directory.
|
# This file is autogenerated from update.sh in the same directory.
|
||||||
{
|
{
|
||||||
beta = {
|
beta = {
|
||||||
sha256 = "01sw6ql4fr1zwbw4l4c3xgmd3jqil9lgmpmlhfyj9ga4kp2qlnim";
|
sha256 = "1mk6gb3iif8i6zq41wjn3lhqqlqp1syzpav1nj0170l7v348p0ns";
|
||||||
sha256bin64 = "0xwxb54l1ylrckxd36pkzcla34d5hbnhxz3gkrv4id530l6ms6jh";
|
sha256bin64 = "02zq7gy51nclfh8806yqv4713cpb4yamy0h7x1zgcd2rxvqm4v53";
|
||||||
version = "75.0.3770.27";
|
version = "75.0.3770.80";
|
||||||
};
|
};
|
||||||
dev = {
|
dev = {
|
||||||
sha256 = "0fq8sjyscz998ha4wnn4npr3bb4jslcjc1i7xgwz6bh4yhi1az4f";
|
sha256 = "0h0dbmk8l45c61g8iiylfnw45rqyqwc40brphwksi6gsvwn2yw8h";
|
||||||
sha256bin64 = "1yb6ff6bg662klki7dcrdaysmsnqrnlp8syxcvwl2rysswll3wyl";
|
sha256bin64 = "0vrwsllnrcgdvsflncqhwyfbjiqcj0n3mxyyyalr8arvkpz5r5ai";
|
||||||
version = "76.0.3788.1";
|
version = "76.0.3806.1";
|
||||||
};
|
};
|
||||||
stable = {
|
stable = {
|
||||||
sha256 = "01ifjsss3nqr15xx2iqsiqgjq1xc07j7ljnapsb484m7dcfk3gnw";
|
sha256 = "1mk6gb3iif8i6zq41wjn3lhqqlqp1syzpav1nj0170l7v348p0ns";
|
||||||
sha256bin64 = "0zkv4x4vbra476c6wy4igp6k80r9ssb9632wsyrzjni9w3zk9qvy";
|
sha256bin64 = "03agz2bl22cmwgdcni8lbzjrwpikg5caimh8ynmhnpy7q9r3zy2w";
|
||||||
version = "74.0.3729.157";
|
version = "75.0.3770.80";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user