From 7982b54a507538a206e528f412a310b05b7164bc Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Sun, 22 Sep 2024 23:09:44 +0530 Subject: [PATCH 1/2] google-chrome: fix update script Chrome uses partial rollout for Darwin and Windows This is represented by `fractionGroup` and `fraction`. 0.25 means 25% of users, 0.5 means 50% of users and so on. Partial rollouts aren't done on linux, and so `fraction` and `fractionalGroup` is always 1 for it. Here we add some additional parameters to chrome version history api endpoint, to get the latest version, sort the versions in descending order. These parameters are redundant on Linux but kept anyway. See https://github.com/NixOS/nixpkgs/pull/343552#issuecomment-2366799267 Docs: https://developer.chrome.com/docs/web-platform/versionhistory/reference#filter (cherry picked from commit bc4914bcf114da6eb5da46f6cb1f2be3e0fb917a) --- pkgs/by-name/go/google-chrome/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/go/google-chrome/update.sh b/pkgs/by-name/go/google-chrome/update.sh index 0e63c9bb6090..cf5113eac6a8 100755 --- a/pkgs/by-name/go/google-chrome/update.sh +++ b/pkgs/by-name/go/google-chrome/update.sh @@ -10,7 +10,7 @@ get_version_info() { local start_pattern="$2" local end_pattern="$3" - local url="https://versionhistory.googleapis.com/v1/chrome/platforms/${platform}/channels/stable/versions/all/releases" + local url="https://versionhistory.googleapis.com/v1/chrome/platforms/${platform}/channels/stable/versions/all/releases?filter=endtime=none,fraction>=0.5&order_by=version%20desc" local response local version local current_version From a5cb891595cce446e0ed71d9b6318f5f014ed0a3 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Sun, 22 Sep 2024 23:16:12 +0530 Subject: [PATCH 2/2] google-chrome: 128.0.6613.138 -> 129.0.6668.59 (Darwin) update script works now, yay! (cherry picked from commit 22d8492295fc3c7f06d9d862bd0fad5e18d8122b) --- pkgs/by-name/go/google-chrome/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index 569ed529c9f3..24f266f85d3a 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -258,11 +258,11 @@ let darwin = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "128.0.6613.138"; + version = "129.0.6668.59"; src = fetchurl { - url = "http://dl.google.com/release2/chrome/gtm24cqmnwgcp7dtscvlmsbrwa_128.0.6613.138/GoogleChrome-128.0.6613.138.dmg"; - hash = "sha256-wd6n3AeKxKdz+5X9XxTi1QHzmByzKRgIWcc3iBHhtZs="; + url = "http://dl.google.com/release2/chrome/acinjqjzbtmzhvrebvzymzvzfaoq_129.0.6668.59/GoogleChrome-129.0.6668.59.dmg"; + hash = "sha256-02J3TpcAsCvsB71C8/bfgIxiqcGIxjKiTWR32On66+g="; }; dontPatch = true;