From 31633b139759436c5e90f00523abd8f44a8c7583 Mon Sep 17 00:00:00 2001 From: Ambroz Bizjak Date: Fri, 11 Aug 2017 20:55:29 +0200 Subject: [PATCH 1/2] Revert "Revert "chromium: 58.0.3029.110 -> 60.0.3112.78"" This reverts commit 138313fe01402c836ee94638f6cb38adc1d1b92f. --- .../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 90e9543ad26e..ba3995f129a0 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 = "1rxc555l3bxczg9vigr2p0y7j1gswy99gs5yhkbj3raakym32563"; - sha256bin64 = "1j29njdfmby3ym8a7r4v3id645d1804j8s3kpi430jkl7dx7sla6"; - version = "59.0.3071.86"; + sha256 = "1sh3rq36sh4g7blajvqfvs06fs5sbrbdp50qq0cvcj4k3fmb4bd8"; + sha256bin64 = "1w67y4z57qm5fwniayncly7a4mjmwqir7gfd54ny8lwlf247d43m"; + version = "60.0.3112.78"; }; dev = { - sha256 = "05kxl938mh41341lh5xsxcqxv9hhx8yn6nkawgg241sfwdx72db8"; - sha256bin64 = "1mr2615r30zjxa55mdcbfi0k2grgyykzawslmg41aw0jy5hfamal"; - version = "60.0.3095.5"; + sha256 = "0b8bzxnnzfl17vw0gwds89zjc4z4zi6fdz8f97w3x8a5ad0c2h5i"; + sha256bin64 = "1n1q6g7avw4yrzdhpzq0pfd12k1fb18hc01jqnq2ak0aisdaga72"; + version = "61.0.3163.13"; }; stable = { - sha256 = "1zvqim75mlqckvf7awrbyggis71dlkz4gjpfrmfdvydcs8yyyk7j"; - sha256bin64 = "0vfx2m5zqfvfb6sgd3dg1sji72dzjcd1sf4r6qwhnz38wadys7id"; - version = "58.0.3029.110"; + sha256 = "1sh3rq36sh4g7blajvqfvs06fs5sbrbdp50qq0cvcj4k3fmb4bd8"; + sha256bin64 = "0wbqbbq9zxizfbjxj241nhk1qgjq91db0lzzbkm5hjvjhx6war4s"; + version = "60.0.3112.78"; }; } From c4f199a99170fffaa8b627754f2ce302e99d19b6 Mon Sep 17 00:00:00 2001 From: Ambroz Bizjak Date: Fri, 11 Aug 2017 20:52:20 +0200 Subject: [PATCH 2/2] chromium: fix beta version build Fixes build error https://nix-cache.s3.amazonaws.com/log/0vb420kj4ys98k4ayq1sxkclkhlkazzx-chromium-60.0.3112.78.drv --- .../networking/browsers/chromium/common.nix | 4 +++- .../browsers/chromium/patches/fix-bootstrap-gn-2.patch | 10 ++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/networking/browsers/chromium/patches/fix-bootstrap-gn-2.patch diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 09fce2e9e15c..a241be3f1e51 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -114,7 +114,9 @@ let ./patches/fix_network_api_crash.patch ] ++ optional (versionOlder version "57.0") ./patches/glibc-2.24.patch ++ optional enableWideVine ./patches/widevine.patch - ++ optional (versionOlder version "59.0.0.0") ./patches/fix-bootstrap-gn.patch; + ++ optional (versionOlder version "59.0.0.0") ./patches/fix-bootstrap-gn.patch + ++ optional (versionAtLeast version "60.0.0.0" && versionOlder version "61.0.0.0") + ./patches/fix-bootstrap-gn-2.patch; postPatch = '' # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX diff --git a/pkgs/applications/networking/browsers/chromium/patches/fix-bootstrap-gn-2.patch b/pkgs/applications/networking/browsers/chromium/patches/fix-bootstrap-gn-2.patch new file mode 100644 index 000000000000..10d277d1c4e1 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/fix-bootstrap-gn-2.patch @@ -0,0 +1,10 @@ +--- a/tools/gn/bootstrap/bootstrap.py ++++ b/tools/gn/bootstrap/bootstrap.py +@@ -487,6 +487,7 @@ + 'base/sys_info.cc', + 'base/task_runner.cc', + 'base/task_scheduler/delayed_task_manager.cc', ++ 'base/task_scheduler/environment_config.cc', + 'base/task_scheduler/post_task.cc', + 'base/task_scheduler/priority_queue.cc', + 'base/task_scheduler/scheduler_lock_impl.cc',