diff --git a/pkgs/by-name/mu/musescore-evolution/package.nix b/pkgs/by-name/mu/musescore-evolution/package.nix index 2e8ca20d2d02..833ca12c694d 100644 --- a/pkgs/by-name/mu/musescore-evolution/package.nix +++ b/pkgs/by-name/mu/musescore-evolution/package.nix @@ -22,21 +22,26 @@ libopus, tinyxml-2, qt5, # Needed for musescore 3.X + fetchpatch, }: stdenv.mkDerivation (finalAttrs: { pname = "musescore-evolution"; - version = "3.7.0-unstable-2026-01-12"; + version = "3.7.0-unstable-2026-03-03"; src = fetchFromGitHub { owner = "Jojo-Schmitz"; repo = "MuseScore"; - rev = "0b4543baca9b1b70d54cecb33cbf846dabc073d1"; - hash = "sha256-piOXHKlnfCO1n0kAgeszqa6JVoHgF8B2OF7agpadGKQ="; + rev = "67504236fa073783f6616545185ec8bde6c22647"; + hash = "sha256-QUUvUkdrJ4iL6cgDob+PdVRZp44kzHeoOi2N0Xb51To="; }; patches = [ ./musescore-evolution-pch-fix.patch + (fetchpatch { + url = "https://github.com/Jojo-Schmitz/MuseScore/commit/bbaa38ba2babb339043f87d50cec3240ca49fe0b.patch"; + hash = "sha256-TbbrBo4uWCHeAs0Er3eYL+i0JWafI0zhetLpFjN0xg8="; + }) ]; # From top-level CMakeLists.txt: diff --git a/pkgs/by-name/mu/musescore-evolution/update.sh b/pkgs/by-name/mu/musescore-evolution/update.sh index 129ae0ef87bb..3449d304edbf 100755 --- a/pkgs/by-name/mu/musescore-evolution/update.sh +++ b/pkgs/by-name/mu/musescore-evolution/update.sh @@ -3,24 +3,25 @@ set -euo pipefail +# Fallback to default attribute path if not set +attr_path="${UPDATE_NIX_ATTR_PATH:-musescore-evolution}" + # Run nix-update on the default branch (updates rev and sha256) -nix-update musescore-evolution --version=branch +nix-update $attr_path --version=branch # Now we need to update the version name # Find the new version generated from the nix-update command (e.g. "0-unstable-2026-01-12") -generated_version=$(nix eval --raw -f . ${UPDATE_NIX_ATTR_PATH}.version) +generated_version=$(nix eval --raw -f . ${attr_path}.version) -# Extract only the date part (after the last dash) (e.g. 0-unstable-2026-01-12) -parts=(${generated_version//-/ }) # Split up by dashes -clean_date="${parts[2]}-${parts[3]}-${parts[4]}" # Get clean date in YYYY-MM-DD format (e.g. "2026-01-12") +# Extract the last ISO date (YYYY-MM-DD) found in the generated version (e.g. 2026-01-12) +clean_date=$(printf '%s\n' "$generated_version" | grep -oE '[0-9]{4}-[0-9]{2}-[0-9]{2}' | tail -n1 || true) -# Compute version prefix based on previous version -old_version="$UPDATE_NIX_OLD_VERSION" -prefix="${old_version%-*}" # e.g. "3.7.0-unstable" +# Version prefix remains unchanged +prefix="3.7.0-unstable" -new_version="${prefix}-${clean_date}" +new_version="${prefix}-${clean_date}" # (e.g. "3.7.0-unstable-2026-01-12") # Patch version in nix file # Strip any existing version line and replace with new one -sed -i "s/version = \".*\"/version = \"${new_version}\"/" $(nix eval --raw -f . ${UPDATE_NIX_ATTR_PATH}.meta.position | cut -d: -f1) +sed -i "s/version = \".*\"/version = \"${new_version}\"/" $(nix eval --raw -f . ${attr_path}.meta.position | cut -d: -f1)