From 751f923d7a4354661a5a23411fa6c3a7e498154b Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Wed, 15 May 2024 12:47:11 +0100 Subject: [PATCH 1/2] google-chrome: increase safety of update-script --- pkgs/by-name/go/google-chrome/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index ff54ecddd68e..f0ad77a2bfcf 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -146,10 +146,11 @@ in stdenv.mkDerivation (finalAttrs: { updateScript = writeScript "update-google-chrome.sh" '' #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl jq common-updater-scripts + set -euo pipefail url="https://versionhistory.googleapis.com/v1/chrome/platforms/linux/channels/stable/versions/all/releases" - response=$(curl --silent $url) - version=$(jq ".releases[0].version" --raw-output <<< "$response") - update-source-version ${finalAttrs.pname} "$version" --ignore-same-hash + response="$(curl --silent --fail $url)" + version="$(jq ".releases[0].version" --raw-output <<< $response)" + update-source-version ${finalAttrs.pname} $version --ignore-same-hash ''; }; From b85faff72369380f27fb97d2e27f4075954ec3ca Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Wed, 15 May 2024 13:53:30 +0100 Subject: [PATCH 2/2] google-chrome: 124.0.6367.201 -> 125.0.6422.60 --- pkgs/by-name/go/google-chrome/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index f0ad77a2bfcf..bd0a31aadf3b 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -64,11 +64,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "google-chrome"; - version = "124.0.6367.201"; + version = "125.0.6422.60"; 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-RvQdpDmWRcsASh1b8M0Zg+AvZprE5qhi14shfo0WlfE="; + hash = "sha256-Q0QMPthJLVquJp7fm6QN+lDb0quZsT7hv6KRXfdBMl4="; }; nativeBuildInputs = [ patchelf makeWrapper ];