From f99821ba626751f8b7e92f94e08494e2d46256dc Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Wed, 17 Nov 2021 07:33:30 +0000 Subject: [PATCH 01/16] electron_12: 12.2.2 -> 12.2.3 https://github.com/electron/electron/releases/tag/v12.2.3 (cherry picked from commit c96842ed019baac7003110b90b8fc2f27594f459) --- pkgs/development/tools/electron/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 8713781e1938..870e8a35c77a 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -105,13 +105,13 @@ rec { headers = "1zkdgpjrh1dc9j8qyrrrh49v24960yhvwi2c530qbpf2azgqj71b"; }; - electron_12 = mkElectron "12.2.2" { - armv7l-linux = "aeee4acf40afa0397c10a4c76bc61ed2967433bab5c6f11de181fa33d0b168ff"; - aarch64-linux = "593a3fef97a7fed8e93b64d659af9c736dff445eedcbfd037f7d226a88d58862"; - x86_64-linux = "a8e88c67f375e41f3a6f8b8a8c3a1e41b8c0a46f1b731e05de21208caa005fb2"; - i686-linux = "5f0bdc9581237f2f87b5d34e232d711617bd8bf5ff5d7ebd66480779c13fba0a"; - x86_64-darwin = "8a33d2bed668e30a6d64856e01d2aa3b1f1d9efe4eb0e808e916694d32d5e8f2"; - aarch64-darwin = "256daa25a8375c565b32c3c2f0e12fbac8d5039a13a9edbb3673a863149b750a"; - headers = "1fvqkw08pync38ixi5cq4f8a108k2ajxpm1w2f8sn2hjph9kpbsd"; + electron_12 = mkElectron "12.2.3" { + armv7l-linux = "4de83c34987ac7b3b2d0c8c84f27f9a34d9ea2764ae1e54fb609a95064e7e71a"; + aarch64-linux = "d29d234c09ba810d89ed1fba9e405b6975916ea208d001348379f89b50d1835c"; + x86_64-linux = "deae6d0941762147716b8298476080d961df2a32d0f6f57b244cbe3a2553cd24"; + i686-linux = "11b4f159cd3b89d916cc05b5231c2cde53f0c6fb5be8e881824fde00daa5e8c2"; + x86_64-darwin = "5af34f1198ce9fd17e9fa581f57a8ad2c9333187fb617fe943f30b8cde9e6231"; + aarch64-darwin = "0db2c021a047a4cd5b28eea16490e16bc82592e3f8a4b96fbdc72a292ce13f50"; + headers = "1idam1xirxqxqg4g7n33kdx2skk0r351m00g59a8yx9z82g06ah9"; }; } From e2e500adbd4a066c401e841ece5d0acbb1bfe33f Mon Sep 17 00:00:00 2001 From: nixpkgs-upkeep-bot Date: Fri, 19 Nov 2021 00:10:13 +0000 Subject: [PATCH 02/16] vscode: 1.62.2 -> 1.62.3 (cherry picked from commit 669740ba937fb7f821a9528e9b6f5e1a6c5d4ab6) --- pkgs/applications/editors/vscode/vscode.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 7939a7b343cb..3ae4588ed13e 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -14,11 +14,11 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0dwpczbxqy3rsqprdiakmqv6s3jzcg2wqxnf1znarx2qffb4ii9x"; - x86_64-darwin = "0si76v80r0vhl76gbdwbykk6acifhifz8sb8wiyiiywkinlxs19w"; - aarch64-linux = "0nwgdvvsblh2r72ys2ng5b084wizkdjd00mm73506mgbs8pzcky4"; - aarch64-darwin = "0qivq4077g5a4gwkskvvzxaa60w1gpgl67pmdyqn81rina04rdqs"; - armv7l-linux = "0myf96s1vdpllnw0vz0rpmyv2pfirv3p8pqgxxnpw860s2c26f2f"; + x86_64-linux = "0wf8bmzag49n81kjb46kj2nkksimm8f7cf4ihpqcw8k5iwasn3j9"; + x86_64-darwin = "1s7i5087bvckg66mcb32krv12vxhaw7ii9vm3i6p72wr0sv7dddh"; + aarch64-linux = "0yzh5javinvas3zz0lliyc77vbcs1jrmxbkr7nic4snscg6wjhcd"; + aarch64-darwin = "13l6ymz7v18s7ikxbwvkwb0f5ff2j82j5pfj04yy75kq9b5gh0vx"; + armv7l-linux = "129wffj9cidk9ysjpq3p0ddn6liwkmrkxhxgz7bqzj8sdhwyq8pz"; }.${system}; in callPackage ./generic.nix rec { @@ -27,7 +27,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.62.2"; + version = "1.62.3"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; From c4fd2fb7140f0144d038fce3a5dfe46f4fa32423 Mon Sep 17 00:00:00 2001 From: nixpkgs-upkeep-bot Date: Fri, 19 Nov 2021 12:09:46 +0000 Subject: [PATCH 03/16] vscodium: 1.62.2 -> 1.62.3 (cherry picked from commit 02b7827778413ec41d54b95f28bb670632e7a71e) --- pkgs/applications/editors/vscode/vscodium.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 1d567c879260..2cee66c886e4 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "19r4883qa73b23xw0fz21bnp9vcvsbn1q77n6pcm1achwpxscrg6"; - x86_64-darwin = "0gv4208vcr75wyp6vji1cg6644f5yfwgkgkiav37218v1wjzb4r0"; - aarch64-linux = "00jzjapyj96bqqq6pz4mdlihwa5g1izkqcp4lqml7hqvmcqrjyrs"; - armv7l-linux = "0daji52lfbgz0by11idai55ip0m859s35vbyvgv655s21aakrs50"; + x86_64-linux = "0g1c88i0nkg4hys00vhqp0i2n3kjl395fd2rimi2p49y042b5c9g"; + x86_64-darwin = "1521aqrv9zx2r5cy8h2011iz3v5lvayizlgv8j7j8qi272mmvx5k"; + aarch64-linux = "1kk0jrhqx6q325zmfg553pqmk6v9cx3a99bsh9rzvdlca94nmpj0"; + armv7l-linux = "08hy61a9pp18b1x7lnsc7b9y3bvnjmavazz7qkhp5qxl2gs802wm"; }.${system}; sourceRoot = { @@ -33,7 +33,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.62.2"; + version = "1.62.3"; pname = "vscodium"; executableName = "codium"; From bbb61d24fad629bdff6022ba7a6b4060789bdbbc Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 21 Oct 2021 21:21:52 +0200 Subject: [PATCH 04/16] chromiumDev: 96.0.4664.9 -> 96.0.4664.18 (cherry picked from commit cb5742f0f731333cfcbfe6f806aa8d7b12274657) --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 8f5f1e8a3af9..e3d224cde67b 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,9 +31,9 @@ } }, "dev": { - "version": "96.0.4664.9", - "sha256": "0hlniaglnd19cb3k2wi9mmf56ws8i89lm5y2dbjpr7vqnmj6qc39", - "sha256bin64": "1crl8gbhjyaa0yhkvm4va0g9dyljra8n5zg9bd1znmjlk0c124x3", + "version": "96.0.4664.18", + "sha256": "0z7hplfl9mlbn07svcavzcb2gqn1hchwhhlpz0qykf6kd441kxpf", + "sha256bin64": "0y09aginw5qg7apm9wvxny7y8nxhsq7gnxp1jmghfjhv5xq7pdn9", "deps": { "gn": { "version": "2021-09-24", From 14d34e970021e2110a23368b89c4f27d289b3edd Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 21 Oct 2021 21:21:52 +0200 Subject: [PATCH 05/16] chromiumBeta: 95.0.4638.54 -> 96.0.4664.18 (cherry picked from commit 889f0df41b062603a3be0d1e14436ab9d5d01820) --- .../networking/browsers/chromium/upstream-info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index e3d224cde67b..252a4e7bc57a 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -18,15 +18,15 @@ } }, "beta": { - "version": "95.0.4638.54", - "sha256": "1zb1009gg9962axn2l1krycz7ml20i8z2n3ka2psxpg68pbqivry", - "sha256bin64": "06d0kjnrv8z74icc6nahllxbwn3xxwn0vgc7ss47402zrqig8lch", + "version": "96.0.4664.18", + "sha256": "0z7hplfl9mlbn07svcavzcb2gqn1hchwhhlpz0qykf6kd441kxpf", + "sha256bin64": "0pm8za2vkl30fn2nclg7cfq2ywn5irbzqb3blawybf3cv4ws8nbi", "deps": { "gn": { - "version": "2021-08-11", + "version": "2021-09-24", "url": "https://gn.googlesource.com/gn", - "rev": "69ec4fca1fa69ddadae13f9e6b7507efa0675263", - "sha256": "031znmkbm504iim5jvg3gmazj4qnkfc7zg8aymjsij18fhf7piz0" + "rev": "0153d369bbccc908f4da4993b1ba82728055926a", + "sha256": "0y4414h8jqsbz5af6pn91c0vkfp4s281s85g992xfyl785c5zbsi" } } }, From 1bfe347351be41129e1a43feb15b1c4d4a797513 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 21 Oct 2021 22:40:41 +0200 Subject: [PATCH 06/16] chromiumDev: 96.0.4664.18 -> 97.0.4676.0 (cherry picked from commit 471e147fd094c76495cd65f3766ae931fe76b330) --- .../networking/browsers/chromium/upstream-info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 252a4e7bc57a..834e37556986 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,15 +31,15 @@ } }, "dev": { - "version": "96.0.4664.18", - "sha256": "0z7hplfl9mlbn07svcavzcb2gqn1hchwhhlpz0qykf6kd441kxpf", - "sha256bin64": "0y09aginw5qg7apm9wvxny7y8nxhsq7gnxp1jmghfjhv5xq7pdn9", + "version": "97.0.4676.0", + "sha256": "1cf660h7n1d4ds63747zfc4wmwxm348grcv40zg614cpjm4q68b5", + "sha256bin64": "116a4d47s3sx1pq8hhqybdsjxcv8657xaldrlix2z7jh94ip2nwh", "deps": { "gn": { - "version": "2021-09-24", + "version": "2021-10-08", "url": "https://gn.googlesource.com/gn", - "rev": "0153d369bbccc908f4da4993b1ba82728055926a", - "sha256": "0y4414h8jqsbz5af6pn91c0vkfp4s281s85g992xfyl785c5zbsi" + "rev": "693f9fb87e4febdd4299db9f73d8d2c958e63148", + "sha256": "1qfjj2mdpflry4f9fkagvb76zwfibys4nqz9lddy1zh5nnbd9mff" } } }, From 9ab3c8fca2b7eb1465102e88de85292451a9dbf4 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 28 Oct 2021 19:30:53 +0200 Subject: [PATCH 07/16] chromiumBeta: 96.0.4664.18 -> 96.0.4664.27 (cherry picked from commit 362f6990a6205360ea265b5e6ead3c02bbfac03d) --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 834e37556986..4b7a9100705e 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -18,9 +18,9 @@ } }, "beta": { - "version": "96.0.4664.18", - "sha256": "0z7hplfl9mlbn07svcavzcb2gqn1hchwhhlpz0qykf6kd441kxpf", - "sha256bin64": "0pm8za2vkl30fn2nclg7cfq2ywn5irbzqb3blawybf3cv4ws8nbi", + "version": "96.0.4664.27", + "sha256": "1ym9llqmkhlnrmawc0dcnzkvr714kykvdcldkar5yqp0x46k7bi6", + "sha256bin64": "1x4y589qmiz0zgkpv17phcl8h5c7qankpfvv6c42w5bysx6mn1f7", "deps": { "gn": { "version": "2021-09-24", From e347dd73a7852430ded6463b5a0244d4d9e870ad Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 28 Oct 2021 19:30:54 +0200 Subject: [PATCH 08/16] chromiumDev: 97.0.4676.0 -> 97.0.4682.3 (cherry picked from commit b497744a24244ade64dbfe2b7b7132ce8837e53a) --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 4b7a9100705e..acc11144def9 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,9 +31,9 @@ } }, "dev": { - "version": "97.0.4676.0", - "sha256": "1cf660h7n1d4ds63747zfc4wmwxm348grcv40zg614cpjm4q68b5", - "sha256bin64": "116a4d47s3sx1pq8hhqybdsjxcv8657xaldrlix2z7jh94ip2nwh", + "version": "97.0.4682.3", + "sha256": "1z2d3r3d4g3ng1p73s243jllvvfkh085vvqz0vaa6pv7c9631pn4", + "sha256bin64": "0xravg4jjbwj7vifabz94mfammv0zx754hpa6kynjaqzvlxbax2a", "deps": { "gn": { "version": "2021-10-08", From fe74de7185ffda36344aac9869242e8ce82c7215 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 1 Nov 2021 11:40:34 +0100 Subject: [PATCH 09/16] nixos/tests/chromium: Add a workaround to fix the test for M96+ Some upstream changes broke the automatic fallback to SwiftShader. Without this workaround the GPU initialization fails (apparently due to requiring Vulkan): machine # libva error: vaGetDriverNameByIndex() failed with unknown libva error, driver_name = (null) machine # [1001:1001:1101/104304.000625:ERROR:viz_main_impl.cc(161)] Exiting GPU process due to errors during initialization machine # libva error: vaGetDriverNameByIndex() failed with unknown libva error, driver_name = (null) machine # [1052:1052:1101/104305.060496:ERROR:viz_main_impl.cc(161)] Exiting GPU process due to errors during initialization machine # [1084:1084:1101/104305.165898:ERROR:angle_platform_impl.cc(44)] Display.cpp:894 (initialize): ANGLE Display::initialize error 0: Internal Vulkan error (-3): Initialization of an object could not be completed for implementation-specific reasons, in ../../third_party/angle/src/libANGLE/renderer/vulkan/RendererVk.cpp, initialize:1048. machine # [1084:1084:1101/104305.171191:ERROR:gl_surface_egl.cc(782)] EGL Driver message (Critical) eglInitialize: Internal Vulkan error (-3): Initialization of an object could not be completed for implementation-specific reasons, in ../../third_party/angle/src/libANGLE/renderer/vulkan/RendererVk.cpp, initialize:1048. machine # [1084:1084:1101/104305.178707:ERROR:gl_surface_egl.cc(1382)] eglInitialize SwANGLE failed with error EGL_NOT_INITIALIZED machine # [1084:1084:1101/104305.180111:ERROR:gl_ozone_egl.cc(20)] GLSurfaceEGL::InitializeOneOff failed. machine # [1084:1084:1101/104305.189760:ERROR:viz_main_impl.cc(161)] Exiting GPU process due to errors during initialization machine # [1092:1092:1101/104305.233470:ERROR:gpu_init.cc(457)] Passthrough is not supported, GL is disabled, ANGLE is This workaround restores the previous result: machine # [1004:1004:1101/104551.131190:ERROR:gpu_init.cc(457)] Passthrough is not supported, GL is swiftshader, ANGLE is The workaround is only required for Chromium, not Google Chrome. (cherry picked from commit a188a7448661876eddbe63ac5a18998298afc385) --- nixos/tests/chromium.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix index ea9e19cefbc9..d67acd075a13 100644 --- a/nixos/tests/chromium.nix +++ b/nixos/tests/chromium.nix @@ -80,6 +80,10 @@ mapAttrs (channel: chromiumPkg: makeTest rec { binary = pname # Add optional CLI options: options = [] + major_version = "${versions.major (getVersion chromiumPkg.name)}" + if major_version > "95" and not pname.startswith("google-chrome"): + # Workaround to avoid a GPU crash: + options.append("--use-gl=swiftshader") # Launch the process: options.append("file://${startupHTML}") machine.succeed(ru(f'ulimit -c unlimited; {binary} {shlex.join(options)} & disown')) From 20ae529015b97f5616cd52f56b58b7eb20cff4f7 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 6 Nov 2021 15:41:44 +0100 Subject: [PATCH 10/16] chromiumBeta: 96.0.4664.27 -> 96.0.4664.35 (cherry picked from commit 41dbc0a9954d852ef1d33ec5c79d64fe3cc84b8c) --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index acc11144def9..1c26072b4948 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -18,9 +18,9 @@ } }, "beta": { - "version": "96.0.4664.27", - "sha256": "1ym9llqmkhlnrmawc0dcnzkvr714kykvdcldkar5yqp0x46k7bi6", - "sha256bin64": "1x4y589qmiz0zgkpv17phcl8h5c7qankpfvv6c42w5bysx6mn1f7", + "version": "96.0.4664.35", + "sha256": "047zc1hl5iwhrgnypl7r5ga2cx1yz26lf1x5cnvdqmarmmkq380m", + "sha256bin64": "1cw89fafxxhr85x4vzhxv3jkmqfnxjisc7gj9v8y2ixqpn190hjl", "deps": { "gn": { "version": "2021-09-24", From c511054da10d023a196efe981271aabbda913b82 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 6 Nov 2021 15:41:44 +0100 Subject: [PATCH 11/16] chromiumDev: 97.0.4682.3 -> 97.0.4688.2 (cherry picked from commit 00460bd6e2c89f3b76dcb42032194e6eed0616d2) --- .../networking/browsers/chromium/upstream-info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 1c26072b4948..d10615fdec27 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,15 +31,15 @@ } }, "dev": { - "version": "97.0.4682.3", - "sha256": "1z2d3r3d4g3ng1p73s243jllvvfkh085vvqz0vaa6pv7c9631pn4", - "sha256bin64": "0xravg4jjbwj7vifabz94mfammv0zx754hpa6kynjaqzvlxbax2a", + "version": "97.0.4688.2", + "sha256": "0a5i64gxb24z5mfvmf50g4fafvqqbj7k5077arnhwzp3xiznld88", + "sha256bin64": "0l70qlna8x05rrlcfgv2xyl8g5nlmd42i8n0yc9dw3mwq8m4c4db", "deps": { "gn": { - "version": "2021-10-08", + "version": "2021-10-30", "url": "https://gn.googlesource.com/gn", - "rev": "693f9fb87e4febdd4299db9f73d8d2c958e63148", - "sha256": "1qfjj2mdpflry4f9fkagvb76zwfibys4nqz9lddy1zh5nnbd9mff" + "rev": "8926696a4186279489cc2b8d768533e61bba73d7", + "sha256": "1084lnyb0a1khbgjvak05fcx6jy973wqvsf77n0alxjys18sg2yk" } } }, From 01218292450373d72494d6ebb0527dc157def128 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 10 Nov 2021 20:21:50 +0100 Subject: [PATCH 12/16] chromiumDev: 97.0.4688.2 -> 97.0.4692.8 (cherry picked from commit c4e467e4c865ad3a677146d5384a86ef30673d9d) --- .../networking/browsers/chromium/upstream-info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index d10615fdec27..a36b160c5f94 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,15 +31,15 @@ } }, "dev": { - "version": "97.0.4688.2", - "sha256": "0a5i64gxb24z5mfvmf50g4fafvqqbj7k5077arnhwzp3xiznld88", - "sha256bin64": "0l70qlna8x05rrlcfgv2xyl8g5nlmd42i8n0yc9dw3mwq8m4c4db", + "version": "97.0.4692.8", + "sha256": "0n47jfxs05g55p69f5939jf5pgyw88n4cpg78k019n3zr2vlv1qf", + "sha256bin64": "1gisqc6dz7yfigj0dji7cnx5jdcjz0gmn248cp2a6zs9mfvwwbqv", "deps": { "gn": { - "version": "2021-10-30", + "version": "2021-11-03", "url": "https://gn.googlesource.com/gn", - "rev": "8926696a4186279489cc2b8d768533e61bba73d7", - "sha256": "1084lnyb0a1khbgjvak05fcx6jy973wqvsf77n0alxjys18sg2yk" + "rev": "90294ccdcf9334ed25a76ac9b67689468e506342", + "sha256": "0n0jml8s00ayy186jzrf207hbz70pxiq426znxwxd4gjcp60scsa" } } }, From 617926a51dbe3f259b868e0ea14a7a2225031cdc Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 12 Nov 2021 19:31:02 +0100 Subject: [PATCH 13/16] chromiumBeta: 96.0.4664.35 -> 96.0.4664.45 (cherry picked from commit 177ab8af28b1efee9ad43d28821f5d3bab221682) --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index a36b160c5f94..624dde9e1702 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -18,9 +18,9 @@ } }, "beta": { - "version": "96.0.4664.35", - "sha256": "047zc1hl5iwhrgnypl7r5ga2cx1yz26lf1x5cnvdqmarmmkq380m", - "sha256bin64": "1cw89fafxxhr85x4vzhxv3jkmqfnxjisc7gj9v8y2ixqpn190hjl", + "version": "96.0.4664.45", + "sha256": "01q4fsf2cbx6g9nnaihvc5jj3ap8jq2gf16pnhf7ixzbhgcnm328", + "sha256bin64": "1vaazcrlx0999xd9yp25i9kzb8y8g0yqd28xssw7jqwrhz033wgr", "deps": { "gn": { "version": "2021-09-24", From 343f425ffe12a7f6ff546c4014fd10ecba45841e Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 16 Nov 2021 22:05:30 +0100 Subject: [PATCH 14/16] chromiumDev: 97.0.4692.8 -> 97.0.4692.20 (cherry picked from commit f5e6bb8c7542ee9cdbd180ab5a566afa24b2848b) --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 624dde9e1702..a02230f9b1e3 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,9 +31,9 @@ } }, "dev": { - "version": "97.0.4692.8", - "sha256": "0n47jfxs05g55p69f5939jf5pgyw88n4cpg78k019n3zr2vlv1qf", - "sha256bin64": "1gisqc6dz7yfigj0dji7cnx5jdcjz0gmn248cp2a6zs9mfvwwbqv", + "version": "97.0.4692.20", + "sha256": "1njgfz3kz1pyyaaskqc47ldy2gzc3c9a8mjib81nalzrqbmd3372", + "sha256bin64": "06vsmzz8nvmx7hfqwvqfmq4h000dw22srxdrgrdfgh7mry0yvf4a", "deps": { "gn": { "version": "2021-11-03", From 1deff92615e288d0e8039a97c56b9c6888418eec Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 15 Nov 2021 22:11:28 +0100 Subject: [PATCH 15/16] chromium: 95.0.4638.69 -> 96.0.4664.45 https://chromereleases.googleblog.com/2021/11/stable-channel-update-for-desktop.html This update includes 25 security fixes. CVEs: CVE-2021-38007 CVE-2021-38008 CVE-2021-38009 CVE-2021-38006 CVE-2021-38005 CVE-2021-38010 CVE-2021-38011 CVE-2021-38012 CVE-2021-38013 CVE-2021-38014 CVE-2021-38015 CVE-2021-38016 CVE-2021-38017 CVE-2021-38018 CVE-2021-38019 CVE-2021-38020 CVE-2021-38021 CVE-2021-38022 (cherry picked from commit a39908a7cb0e01c7d3c2f8a9199b14de6209f687) --- .../browsers/chromium/upstream-info.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index a02230f9b1e3..313a03d0dd2f 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,20 +1,20 @@ { "stable": { - "version": "95.0.4638.69", - "sha256": "1rzg48mbd5n75nq2rfwknyxpmfrddds199ic82c736kcgirpv8rq", - "sha256bin64": "1jhxm12sdlgvgnny0p56xsfyxd78mwn9qwc20c33qfvwxrzp9ajp", + "version": "96.0.4664.45", + "sha256": "01q4fsf2cbx6g9nnaihvc5jj3ap8jq2gf16pnhf7ixzbhgcnm328", + "sha256bin64": "0546i4yd1jahv088hjxpq0jc393pscvl5ap3s2qw5jrybliyfd2g", "deps": { "gn": { - "version": "2021-08-11", + "version": "2021-09-24", "url": "https://gn.googlesource.com/gn", - "rev": "69ec4fca1fa69ddadae13f9e6b7507efa0675263", - "sha256": "031znmkbm504iim5jvg3gmazj4qnkfc7zg8aymjsij18fhf7piz0" + "rev": "0153d369bbccc908f4da4993b1ba82728055926a", + "sha256": "0y4414h8jqsbz5af6pn91c0vkfp4s281s85g992xfyl785c5zbsi" } }, "chromedriver": { - "version": "95.0.4638.54", - "sha256_linux": "0p228x7w423p3zqwfdba2jj4x4gkxz4267qzzswpba335p3k1nyk", - "sha256_darwin": "1yxi8c18fa07w8kdm63v4663lhgx1y56957bkqb7hf459bzz594l" + "version": "96.0.4664.35", + "sha256_linux": "0iq129a4mj4sjs08s68n82wd8563sw8196xda27wk3pfpprr23db", + "sha256_darwin": "1prc7zbgnljqz2d89clpk5c0y48r79zmb9in4vinf3j6p2rxn0vy" } }, "beta": { From 82efe0e18b6c3f6c021fdda9de157617d047e219 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 17 Nov 2021 22:34:05 +0100 Subject: [PATCH 16/16] ungoogled-chromium: 95.0.4638.69 -> 96.0.4664.45 (cherry picked from commit 4e77c7efc620ae9eb397ffa0f1d2aeda6fa1c6c6) --- .../networking/browsers/chromium/common.nix | 3 +-- .../browsers/chromium/upstream-info.json | 16 ++++++++-------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index e88c1fa1b94a..118e9c3ea38e 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -150,7 +150,6 @@ let libva libdrm wayland mesa.drivers libxkbcommon curl - ] ++ optionals (chromiumVersionAtLeast "96") [ epoxy ] ++ optionals gnomeSupport [ gnome2.GConf libgcrypt ] ++ optional gnomeKeyringSupport libgnome-keyring3 @@ -183,7 +182,7 @@ let substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \ --replace "/usr/bin/env -S make -f" "/usr/bin/make -f" fi - chmod -x third_party/webgpu-cts/src/tools/${lib.optionalString (chromiumVersionAtLeast "96") "run_"}deno + chmod -x third_party/webgpu-cts/src/tools/run_deno # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \ diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 313a03d0dd2f..d35d3fa75175 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -44,19 +44,19 @@ } }, "ungoogled-chromium": { - "version": "95.0.4638.69", - "sha256": "1rzg48mbd5n75nq2rfwknyxpmfrddds199ic82c736kcgirpv8rq", - "sha256bin64": "1jhxm12sdlgvgnny0p56xsfyxd78mwn9qwc20c33qfvwxrzp9ajp", + "version": "96.0.4664.45", + "sha256": "01q4fsf2cbx6g9nnaihvc5jj3ap8jq2gf16pnhf7ixzbhgcnm328", + "sha256bin64": "0546i4yd1jahv088hjxpq0jc393pscvl5ap3s2qw5jrybliyfd2g", "deps": { "gn": { - "version": "2021-08-11", + "version": "2021-09-24", "url": "https://gn.googlesource.com/gn", - "rev": "69ec4fca1fa69ddadae13f9e6b7507efa0675263", - "sha256": "031znmkbm504iim5jvg3gmazj4qnkfc7zg8aymjsij18fhf7piz0" + "rev": "0153d369bbccc908f4da4993b1ba82728055926a", + "sha256": "0y4414h8jqsbz5af6pn91c0vkfp4s281s85g992xfyl785c5zbsi" }, "ungoogled-patches": { - "rev": "95.0.4638.69-1", - "sha256": "19azr4m4rd6za9vgcggijyq9x54jrjp0n07y4falgjrdz9q4f7aj" + "rev": "96.0.4664.45-1", + "sha256": "1k0kf5ika1sz489bcbn485kmdq1xp7ssa80gbqrpd60xihkhnrm3" } } }