about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Weiss <dev.primeos@gmail.com>2021-09-25 00:59:31 +0200
committerGitHub <noreply@github.com>2021-09-25 00:59:31 +0200
commitf4ddd611056a83a9714098d075a1ecb37d11d763 (patch)
tree7ae2cadce725163325268fed749d931001a90443
parent3a6cdbeb5774ed4bd0bf20bce8c84fd7709066be (diff)
parenteba807d5949801334cf4742423e8a7d5eb161d26 (diff)
downloadnixlib-f4ddd611056a83a9714098d075a1ecb37d11d763.tar
nixlib-f4ddd611056a83a9714098d075a1ecb37d11d763.tar.gz
nixlib-f4ddd611056a83a9714098d075a1ecb37d11d763.tar.bz2
nixlib-f4ddd611056a83a9714098d075a1ecb37d11d763.tar.lz
nixlib-f4ddd611056a83a9714098d075a1ecb37d11d763.tar.xz
nixlib-f4ddd611056a83a9714098d075a1ecb37d11d763.tar.zst
nixlib-f4ddd611056a83a9714098d075a1ecb37d11d763.zip
Merge pull request #139362 from primeos/chromiumDev
chromiumDev: 95.0.4638.17 -> 96.0.4651.0
-rw-r--r--pkgs/applications/networking/browsers/chromium/common.nix2
-rw-r--r--pkgs/applications/networking/browsers/chromium/upstream-info.json6
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 767a3f4483ce..4b7fbc38bbcc 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -181,7 +181,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/deno
+      chmod -x third_party/webgpu-cts/src/tools/${lib.optionalString (chromiumVersionAtLeast "96") "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 0f0cc3437e95..d7f29c4fefa2 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": "95.0.4638.17",
-    "sha256": "1v5r8m3wlwh6prcj7bd4zprsr4g43869lhxv43m207c5nlnqiriz",
-    "sha256bin64": "1azn9216jhcdg4yjr6frz8vp98qbcnnhifp9jn9bwvyg69lr0dwb",
+    "version": "96.0.4651.0",
+    "sha256": "0da1mhz3cy0k2igdh208i28k8fxca0yjfypvmj7624p7igrp4an6",
+    "sha256bin64": "1gslpdnpjp7w40lsl748rmbkbs31v22f2x45gahrijkvfrkgdqp9",
     "deps": {
       "gn": {
         "version": "2021-08-11",