diff --git a/pkgs/by-name/li/lilypond/package.nix b/pkgs/by-name/li/lilypond/package.nix index 0fad1654d612..011082c5345b 100644 --- a/pkgs/by-name/li/lilypond/package.nix +++ b/pkgs/by-name/li/lilypond/package.nix @@ -41,12 +41,11 @@ ] ), writeScript, - fetchpatch2, }: stdenv.mkDerivation (finalAttrs: { pname = "lilypond"; - version = "2.24.4"; + version = "2.26.0"; outputs = [ "out" "man" @@ -54,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchzip { url = "https://lilypond.org/download/sources/v${lib.versions.majorMinor finalAttrs.version}/lilypond-${finalAttrs.version}.tar.gz"; - hash = "sha256-UYdORvodrVchxslOxpMiXrAh7DtB9sWp9yqZU/jeB9Y="; + hash = "sha256-HUkPhaWNZ4UKbmlEyLXepHCFcgrdoRSDtjZMriO68RM="; }; postInstall = '' @@ -79,17 +78,7 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "mem=mf2pt1" "mem=$PWD/mf/mf2pt1" ''; - patches = [ - # fixes #475503 - # distilled version of https://gitweb.git.savannah.gnu.org/gitweb/?p=lilypond.git;a=commit;h=f2192eb294e - # so, remove once that commit reaches a stable release - (fetchpatch2 { - name = "fix-clang-21-build.patch"; - url = "https://cgit.freebsd.org/ports/plain/print/lilypond/files/patch-lily_include_smobs.hh?id=58bab68c706086774b17dcacc61c8fd37ecc8a15"; - extraPrefix = ""; # adds old/new prefixes to process properly in patchPhase - hash = "sha256-nT8+nYU+m6lLTvHEvSIpG/yAwy1Omb6+4Z+NGwEVE4Q="; - }) - ]; + patches = [ ]; strictDeps = true;