summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Seager <jon@sgrs.uk>2024-10-16 21:10:58 +0100
committerGitHub <noreply@github.com>2024-10-16 21:10:58 +0100
commitbcf8f3186c6f817ae20ada6dc5c7248b17ce2ee7 (patch)
treee694d17a26d63625414c78b147290ccdd2be967a
parentthunderbird-115, thunderbird-128: minor update (#348220) (diff)
parentgoogle-chrome: 129.0.6668.101 -> 130.0.6723.59 (diff)
downloadnixpkgs-bcf8f3186c6f817ae20ada6dc5c7248b17ce2ee7.tar.gz
[Backport release-24.05] google-chrome: fix URL encoding for version filter, add `shellcheck`, 129.0.6668.{100,101} -> 130.0.6723.{58,59} (#349061)
-rw-r--r--pkgs/by-name/go/google-chrome/package.nix10
-rwxr-xr-xpkgs/by-name/go/google-chrome/update.sh3
2 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix
index 9f32c5285230..ff50b35f10f2 100644
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -166,11 +166,11 @@ let
linux = stdenv.mkDerivation (finalAttrs: {
inherit pname meta passthru;
- version = "129.0.6668.100";
+ version = "130.0.6723.58";
src = fetchurl {
url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
- hash = "sha256-5NITOnDEVd5PeyWT9rPVgFv5W5bP2h+bLM30hjmpgzs=";
+ hash = "sha256-HWFC+9Op4ja/S3eP56N9hkOkMbCrbF+NHEcxSLb85Hg=";
};
# With strictDeps on, some shebangs were not being patched correctly
@@ -266,11 +266,11 @@ let
darwin = stdenvNoCC.mkDerivation (finalAttrs: {
inherit pname meta passthru;
- version = "129.0.6668.101";
+ version = "130.0.6723.59";
src = fetchurl {
- url = "http://dl.google.com/release2/chrome/j4koa2lwvw3lho34hvastakhfi_129.0.6668.101/GoogleChrome-129.0.6668.101.dmg";
- hash = "sha256-rwH7BqOyszmybadZ4gtJHoVxxjcjZLHcOku+YxZH88w=";
+ url = "http://dl.google.com/release2/chrome/oehlfkedv43jkzlol2mqd6xife_130.0.6723.59/GoogleChrome-130.0.6723.59.dmg";
+ hash = "sha256-ioEWtD49XtZTItz+bCiDobV0nW82Dv6S41/oHlUsatU=";
};
dontPatch = true;
diff --git a/pkgs/by-name/go/google-chrome/update.sh b/pkgs/by-name/go/google-chrome/update.sh
index cf5113eac6a8..e7d2988ffe0a 100755
--- a/pkgs/by-name/go/google-chrome/update.sh
+++ b/pkgs/by-name/go/google-chrome/update.sh
@@ -1,5 +1,6 @@
#!/usr/bin/env nix-shell
#!nix-shell -I nixpkgs=./. -i bash -p curl jq gawk libossp_uuid libxml2 nix
+# shellcheck shell=bash
set -euo pipefail
@@ -10,7 +11,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?filter=endtime=none,fraction>=0.5&order_by=version%20desc"
+ local url="https://versionhistory.googleapis.com/v1/chrome/platforms/${platform}/channels/stable/versions/all/releases?filter=endtime=none,fraction%3E=0.5&order_by=version%20desc"
local response
local version
local current_version