miru: added passthru.updateScript #325352

matteo-pacini · 2024-07-07T21:02:23Z

Description of changes

Added an update script for Miru.

To test it (in my branch):

nix-shell maintainers/scripts/update.nix --argstr package miru

Then build miru again - nix-build -A miru - and run it.

It should be the latest available version: 5.1.10 at the time of this port.

Things done

Add a 👍 reaction to pull requests you find important.

nixos-discourse · 2024-07-08T17:49:47Z

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/4210

d4ilyrun · 2024-07-08T18:12:53Z

pkgs/by-name/mi/miru/update.sh

+MIRU_LATEST_VER=$(curl -s "https://api.github.com/repos/ThaUnknown/miru/releases/latest" | jq -r .tag_name | sed 's/v//')
+MIRU_CURRENT_VER=$(grep -oP 'version = "\K[^"]+' "$PACKAGE_NIX")


Suggested change

MIRU_LATEST_VER=$(curl -s "https://api.github.com/repos/ThaUnknown/miru/releases/latest" | jq -r .tag_name | sed 's/v//')

MIRU_CURRENT_VER=$(grep -oP 'version = "\K[^"]+' "$PACKAGE_NIX")

MIRU_LATEST_VER="$(curl -s "https://api.github.com/repos/ThaUnknown/miru/releases/latest" | jq -r .tag_name | sed 's/v//')"

MIRU_CURRENT_VER="$(grep -oP 'version = "\K[^"]+' "$PACKAGE_NIX")"

d4ilyrun · 2024-07-08T18:24:07Z

pkgs/by-name/mi/miru/update.sh

+LINUX_NIX="$ROOT/linux.nix"
+DARWIN_NIX="$ROOT/darwin.nix"
+
+MIRU_LATEST_VER=$(curl -s "https://api.github.com/repos/ThaUnknown/miru/releases/latest" | jq -r .tag_name | sed 's/v//')


You should specify that you only want to remove the starting v (in case the versioning format ever changes we never know)

Suggested change

MIRU_LATEST_VER=$(curl -s "https://api.github.com/repos/ThaUnknown/miru/releases/latest" | jq -r .tag_name | sed 's/v//')

MIRU_LATEST_VER=$(curl -s "https://api.github.com/repos/ThaUnknown/miru/releases/latest" | jq -r .tag_name | sed 's/^v//')

We could use a more robust regex (s/^v([0-9]+\.[0-9]+\.[0-9]+)$/\1) to be sure that this does not break in case the versioning system changes. But keeping it simple should suffice and will avoid any potential error (and it's more readable), so I will leave it up to you to decide.

Keeping the readable one for now, will revisit if things change upstream

d4ilyrun · 2024-07-08T18:35:13Z

pkgs/by-name/mi/miru/update.sh

+LINUX_NIX="$ROOT/linux.nix"
+DARWIN_NIX="$ROOT/darwin.nix"
+
+MIRU_LATEST_VER=$(curl -s "https://api.github.com/repos/ThaUnknown/miru/releases/latest" | jq -r .tag_name | sed 's/v//')


Please check whether the request returned a valid result (e.g. if the repository's name changes the version tag will be null, raising a rather unclear error message from nix-prefetch-url, which could be prevented)

--- SHOWING ERROR LOG FOR miru-5.1.6 ---------------------- error: unable to download 'https://github.com/ThaUnknown/mirud/releases/download/vnull/linux-Miru-null.AppImage': HTTP error 404 response body: Not Found error: hash '' has wrong length for hash type 'sha256' --- SHOWING ERROR LOG FOR miru-5.1.6 ---------------------- The update script for miru-5.1.6 failed with exit code 1

d4ilyrun

Oops, I'm sorry I unintentionally approved and github won't let me remove my approval 😓
Please address my remarks first.

d4ilyrun · 2024-07-08T18:44:18Z

Tested on x86_64-linux

matteo-pacini · 2024-07-08T20:22:29Z

@d4ilyrun comments addressed, retested on aarch64-darwin on my end, all good 👍🏻

d4ilyrun · 2024-07-08T21:40:36Z

pkgs/by-name/mi/miru/update.sh

+MIRU_CURRENT_VER="$(grep -oP 'version = "\K[^"]+' "$PACKAGE_NIX")"
+
+if [[ "$MIRU_LATEST_VER" == "null" ]]; then
+    echo "error: could not fetch miru latest version from GitHub API"


The update.py script only displays the content of stderr when an error occurs.

Suggested change

echo "error: could not fetch miru latest version from GitHub API"

echo "error: could not fetch miru latest version from GitHub API" >&2

Good to know, thanks!

@d4ilyrun fixed

d4ilyrun · 2024-07-08T21:52:18Z

pkgs/by-name/mi/miru/update.sh

+
+ROOT="$(dirname "$(readlink -f "$0")")"
+if [[ ! "$(basename $ROOT)" == "miru" || ! -f "$ROOT/package.nix" ]]; then
+    echo "ERROR: Not in the miru folder"


Oops sorry I missed this one, same as the previous error message

Suggested change

echo "ERROR: Not in the miru folder"

echo "error: Not in the miru folder" >&2

LGTM after this one !

@matteo-pacini You re-requested a review but did not fix this last issue, was this a mistake?

@d4ilyrun yup, my bad! Forgot to push the changes 😇

nixos-discourse · 2024-07-10T06:41:33Z

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/4218

eclairevoyant · 2024-07-11T03:48:57Z

Does nix-update not work? I thought it handled gh releases.

d4ilyrun

LGTM 🚀

matteo-pacini · 2024-07-12T15:54:06Z

Does nix-update not work? I thought it handled gh releases.

@eclairevoyant Didn't know it could, hence the custom approach 🙏🏻

nixos-discourse · 2024-07-15T18:43:56Z

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/1828

SuperSandro2000 · 2024-07-16T09:05:57Z

pkgs/by-name/mi/miru/update.sh

+LINUX_NIX="$ROOT/linux.nix"
+DARWIN_NIX="$ROOT/darwin.nix"
+
+MIRU_LATEST_VER="$(curl -s "https://api.github.com/repos/ThaUnknown/miru/releases/latest" | jq -r .tag_name | sed 's/^v//')"


Suggested change

MIRU_LATEST_VER="$(curl -s "https://api.github.com/repos/ThaUnknown/miru/releases/latest" | jq -r .tag_name | sed 's/^v//')"

MIRU_LATEST_VER="$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/ThaUnknown/miru/releases/latest" | jq -r .tag_name | sed 's/^v//')"

SuperSandro2000 · 2024-07-16T09:06:27Z

pkgs/by-name/mi/miru/update.sh

+    exit 1
+fi
+
+if [ "$MIRU_LATEST_VER" = "$MIRU_CURRENT_VER" ]; then


Suggested change

if [ "$MIRU_LATEST_VER" = "$MIRU_CURRENT_VER" ]; then

if [[ "$MIRU_LATEST_VER" == "$MIRU_CURRENT_VER" ]]; then

please use new test consistently

matteo-pacini · 2024-07-16T19:57:03Z

@SuperSandro2000 comments addressed, thanks

nixos-discourse · 2024-07-18T18:55:48Z

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/1838

matteo-pacini · 2024-07-19T07:34:05Z

@SuperSandro2000 friendly ping so we can get this merged 🙏🏻 thanks!

pbsds · 2024-07-24T15:03:38Z

pkgs/by-name/mi/miru/update.sh

+ROOT="$(dirname "$(readlink -f "$0")")"
+if [[ ! "$(basename $ROOT)" == "miru" || ! -f "$ROOT/package.nix" ]]; then
+    echo "error: Not in the miru folder" >&2
+    exit 1
+fi


nixpkgs-update and r-ryantm will usually call the update script from nixpkgs root folder. You can test this easily with nix-update -u miru

@pbsds left another comment in #329752 - r-ryantm stopped calling the update script for some reason after that change?

please note the -u, which will call the passthru.updateScript

matteo-pacini · 2024-08-01T05:11:16Z

@SuperSandro2000 friendly ping for merge, as this has been alive for 3 weeks now 🙏🏻

tomberek · 2024-08-02T06:28:10Z

functions as expected... further updates to 5.2.7 pending

matteo-pacini requested a review from d4ilyrun July 7, 2024 21:02

ofborg bot added 10.rebuild-darwin: 0 10.rebuild-linux: 0 labels Jul 7, 2024

d4ilyrun approved these changes Jul 8, 2024

View reviewed changes

d4ilyrun suggested changes Jul 8, 2024

View reviewed changes

matteo-pacini force-pushed the miru-update-script branch from ad4e533 to 27fd1be Compare July 8, 2024 20:21

d4ilyrun suggested changes Jul 8, 2024

View reviewed changes

matteo-pacini force-pushed the miru-update-script branch from 27fd1be to 7470522 Compare July 8, 2024 21:45

d4ilyrun suggested changes Jul 8, 2024

View reviewed changes

matteo-pacini requested a review from d4ilyrun July 9, 2024 19:12

matteo-pacini force-pushed the miru-update-script branch from 7470522 to 14e8bf3 Compare July 12, 2024 15:29

d4ilyrun approved these changes Jul 12, 2024

View reviewed changes

matteo-pacini added the 12.approvals: 1 label Jul 12, 2024

SuperSandro2000 reviewed Jul 16, 2024

View reviewed changes

miru: added passthru.updateScript

bea3a3f

matteo-pacini force-pushed the miru-update-script branch from 14e8bf3 to bea3a3f Compare July 16, 2024 19:56

wegank removed the 12.approvals: 1 label Jul 17, 2024

matteo-pacini added the 12.approvals: 1 label Jul 18, 2024

pbsds reviewed Jul 24, 2024

View reviewed changes

tomberek merged commit 6d4f247 into NixOS:master Aug 2, 2024
26 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

miru: added passthru.updateScript #325352

miru: added passthru.updateScript #325352

matteo-pacini commented Jul 7, 2024 •

edited

Loading

nixos-discourse commented Jul 8, 2024

d4ilyrun Jul 8, 2024

d4ilyrun Jul 8, 2024

matteo-pacini Jul 8, 2024

d4ilyrun Jul 8, 2024

d4ilyrun left a comment •

edited

Loading

d4ilyrun commented Jul 8, 2024

matteo-pacini commented Jul 8, 2024

d4ilyrun Jul 8, 2024

matteo-pacini Jul 8, 2024

matteo-pacini Jul 8, 2024

d4ilyrun Jul 8, 2024 •

edited

Loading

d4ilyrun Jul 8, 2024

d4ilyrun Jul 11, 2024

matteo-pacini Jul 12, 2024

nixos-discourse commented Jul 10, 2024

eclairevoyant commented Jul 11, 2024

d4ilyrun left a comment

matteo-pacini commented Jul 12, 2024

nixos-discourse commented Jul 15, 2024

SuperSandro2000 Jul 16, 2024

SuperSandro2000 Jul 16, 2024

matteo-pacini commented Jul 16, 2024

nixos-discourse commented Jul 18, 2024

matteo-pacini commented Jul 19, 2024

pbsds Jul 24, 2024

matteo-pacini Aug 1, 2024 •

edited

Loading

pbsds Aug 1, 2024

matteo-pacini commented Aug 1, 2024

tomberek commented Aug 2, 2024

		MIRU_LATEST_VER=$(curl -s "https://api.github.com/repos/ThaUnknown/miru/releases/latest" \| jq -r .tag_name \| sed 's/v//')
		MIRU_CURRENT_VER=$(grep -oP 'version = "\K[^"]+' "$PACKAGE_NIX")

	echo "error: could not fetch miru latest version from GitHub API"
	echo "error: could not fetch miru latest version from GitHub API" >&2

	echo "ERROR: Not in the miru folder"
	echo "error: Not in the miru folder" >&2

	MIRU_LATEST_VER="$(curl -s "https://api.github.com/repos/ThaUnknown/miru/releases/latest" \| jq -r .tag_name \| sed 's/^v//')"
	MIRU_LATEST_VER="$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/ThaUnknown/miru/releases/latest" \| jq -r .tag_name \| sed 's/^v//')"

	if [ "$MIRU_LATEST_VER" = "$MIRU_CURRENT_VER" ]; then
	if [[ "$MIRU_LATEST_VER" == "$MIRU_CURRENT_VER" ]]; then

miru: added passthru.updateScript #325352

miru: added passthru.updateScript #325352

Conversation

matteo-pacini commented Jul 7, 2024 • edited Loading

Description of changes

Things done

nixos-discourse commented Jul 8, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

d4ilyrun left a comment • edited Loading

Choose a reason for hiding this comment

d4ilyrun commented Jul 8, 2024

matteo-pacini commented Jul 8, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

d4ilyrun Jul 8, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nixos-discourse commented Jul 10, 2024

eclairevoyant commented Jul 11, 2024

d4ilyrun left a comment

Choose a reason for hiding this comment

matteo-pacini commented Jul 12, 2024

nixos-discourse commented Jul 15, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

matteo-pacini commented Jul 16, 2024

nixos-discourse commented Jul 18, 2024

matteo-pacini commented Jul 19, 2024

Choose a reason for hiding this comment

matteo-pacini Aug 1, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

matteo-pacini commented Aug 1, 2024

tomberek commented Aug 2, 2024

matteo-pacini commented Jul 7, 2024 •

edited

Loading

d4ilyrun left a comment •

edited

Loading

d4ilyrun Jul 8, 2024 •

edited

Loading

matteo-pacini Aug 1, 2024 •

edited

Loading