From 7ce11f384f65e1bf2a30b2e15dad0c69429f66d1 Mon Sep 17 00:00:00 2001 From: SamLukeYes Date: Tue, 4 Mar 2025 01:25:28 +0800 Subject: [PATCH 1/2] librewolf: fix update script Co-authored-by: emaryn <197520219+emaryn@users.noreply.github.com> --- .../networking/browsers/librewolf/update.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/librewolf/update.nix b/pkgs/applications/networking/browsers/librewolf/update.nix index 33807902ea84..f55e57abb065 100644 --- a/pkgs/applications/networking/browsers/librewolf/update.nix +++ b/pkgs/applications/networking/browsers/librewolf/update.nix @@ -10,6 +10,7 @@ nix-prefetch-git, moreutils, runtimeShell, + nix, ... }: @@ -25,6 +26,7 @@ writeScript "update-librewolf" '' jq moreutils nix-prefetch-git + nix ] } set -euo pipefail @@ -44,7 +46,7 @@ writeScript "update-librewolf" '' repoUrl=https://codeberg.org/librewolf/source.git nix-prefetch-git $repoUrl --quiet --rev $latestTag --fetch-submodules > $prefetchOut srcDir=$(jq -r .path < $prefetchOut) - srcHash=$(jq -r .sha256 < $prefetchOut) + srcHash=$(nix hash convert --to sri --hash-algo sha256 $(jq -r .sha256 < $prefetchOut)) ffVersion=$(<$srcDir/version) lwRelease=$(<$srcDir/release) @@ -66,12 +68,12 @@ writeScript "update-librewolf" '' curl --silent --show-error -o "$HOME"/shasums.asc "$mozillaUrl$ffVersion/SHA512SUMS.asc" gpgv --keyring="$GNUPGHOME"/pubring.kbx "$HOME"/shasums.asc "$HOME"/shasums - ffHash=$(grep '\.source\.tar\.xz$' "$HOME"/shasums | grep '^[^ ]*' -o) + ffHash=$(nix hash convert --to sri --hash-algo sha512 $(grep '\.source\.tar\.xz$' "$HOME"/shasums | grep '^[^ ]*' -o)) echo "ffHash=$ffHash" jq ".source.rev = \"$latestTag\"" $srcJson | sponge $srcJson - jq ".source.sha256 = \"$srcHash\"" $srcJson | sponge $srcJson + jq ".source.hash = \"$srcHash\"" $srcJson | sponge $srcJson jq ".firefox.version = \"$ffVersion\"" $srcJson | sponge $srcJson - jq ".firefox.sha512 = \"$ffHash\"" $srcJson | sponge $srcJson + jq ".firefox.hash = \"$ffHash\"" $srcJson | sponge $srcJson jq ".packageVersion = \"$lwVersion\"" $srcJson | sponge $srcJson '' From 2313e1d57e1b8a379f8eb69acea50faae5c6f1ab Mon Sep 17 00:00:00 2001 From: SamLukeYes Date: Tue, 4 Mar 2025 01:28:25 +0800 Subject: [PATCH 2/2] librewolf: 135.0-1 -> 135.0.1-1 --- .../networking/browsers/librewolf/src.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index 7d0234d7f06c..e2ec560cabe6 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "135.0-1", + "packageVersion": "135.0.1-1", "source": { - "rev": "135.0-1", - "hash": "sha256-UyKfgu6/VAfPkLCjlGgG8SGAG/nOyoP3uyesXqLc5Dk" + "rev": "135.0.1-1", + "hash": "sha256-w//XSGqKd9nNX3NmsJvl4UN3tEA1/b9g0xn+hck4hKc=" }, "firefox": { - "version": "135.0", - "hash": "sha256-gn4SqWLvR1EQia9EmPZev0L6V8ox23kL/X6agg0WuWA=" + "version": "135.0.1", + "hash": "sha512-n/fCq2vBZg4znNzXdF+L2sW+JdOnm58DkzhZNScNfvSIWZhWvDjCKuCwZzifpxppmXA7dIBKbg6oJl65l4jOqQ==" } }