From b9043c36095c03cc664305f11fabd32fea0253f4 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 7 Sep 2025 13:07:15 +0200 Subject: [PATCH] mup: 6.8 -> 7.2 --- pkgs/applications/audio/mup/default.nix | 29 +++++++++++-------- .../mup/ghostscript-permit-file-write.patch | 6 ++-- pkgs/top-level/all-packages.nix | 4 +-- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/audio/mup/default.nix b/pkgs/applications/audio/mup/default.nix index b879b7c14c0c..036000338044 100644 --- a/pkgs/applications/audio/mup/default.nix +++ b/pkgs/applications/audio/mup/default.nix @@ -14,15 +14,18 @@ libjpeg, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "mup"; - version = "6.8"; + version = "7.2"; src = fetchurl { - url = "http://www.arkkra.com/ftp/pub/unix/mup${ - builtins.replaceStrings [ "." ] [ "" ] version - }src.tar.gz"; - sha256 = "06bv5nyl8rcibyb83zzrfdq6x6f93g3rgnv47i5gsjcaw5w6l31y"; + urls = [ + # Since the original site is geo-blocked in the EU, we may revert to the archived version; + # please update both URLs during future updates! + "http://www.arkkra.com/ftp/pub/unix/mup72src.tar.gz" + "https://web.archive.org/web/20250907143445/http://www.arkkra.com/ftp/pub/unix/mup72src.tar.gz" + ]; + hash = "sha256-XbfIsSzE7cwdK0DlOyS8PEJbBGc7Doa1HGLsVfx2ZaY="; }; nativeBuildInputs = [ @@ -45,14 +48,16 @@ stdenv.mkDerivation rec { postPatch = '' for f in Makefile.am doc/Makefile.am doc/htmldocs/Makefile.am src/mupmate/Preferences.C; do - substituteInPlace $f --replace doc/packages doc + substituteInPlace $f --replace-fail doc/packages doc done - substituteInPlace src/mupprnt/mupprnt --replace 'mup ' $out/bin/mup' ' - substituteInPlace src/mupdisp/genfile.c --replace '"mup"' '"'$out/bin/mup'"' + substituteInPlace src/mupprnt/mupprnt \ + --replace-fail 'mup ' $out/bin/mup' ' + substituteInPlace src/mupdisp/genfile.c \ + --replace-fail '"mup"' '"'$out/bin/mup'"' substituteInPlace src/mupmate/Preferences.C \ - --replace '"mup"' '"'$out/bin/mup'"' \ - --replace '"gv"' '"xdg-open"' \ - --replace /usr/share/doc $out/share/doc + --replace-fail '"mup"' '"'$out/bin/mup'"' \ + --replace-fail '"gv"' '"xdg-open"' \ + --replace-fail /usr/share/doc $out/share/doc ''; enableParallelBuilding = false; # Undeclared dependencies + https://stackoverflow.com/a/19822767/1687334 for prolog.ps. diff --git a/pkgs/applications/audio/mup/ghostscript-permit-file-write.patch b/pkgs/applications/audio/mup/ghostscript-permit-file-write.patch index 5059e71001f0..544e439afdde 100644 --- a/pkgs/applications/audio/mup/ghostscript-permit-file-write.patch +++ b/pkgs/applications/audio/mup/ghostscript-permit-file-write.patch @@ -1,5 +1,5 @@ --- a/src/mup/Makefile.am +++ b/src/mup/Makefile.am -@@ -39 +39 @@ fontdata.c: prolog.ps ../../tools/mup/getfontinfo.ps ../../LICENSE -- $(GS) -sDEVICE=nullpage -sOutputFile=/dev/null -dQUIET - < ../../tools/mup/getfontinfo.ps | $(SED) -e "/Warning:/d" >> fontdata.c -+ $(GS) -sDEVICE=nullpage -sOutputFile=/dev/null -dQUIET --permit-file-write=charnames:fontinit - < ../../tools/mup/getfontinfo.ps | $(SED) -e "/Warning:/d" >> fontdata.c +@@ -37 +37 @@ fontdata.c: prolog.ps ../../tools/mup/getfontinfo.ps ../../LICENSE +- $(GS) -dNOSAFER -sDEVICE=nullpage -sOutputFile=/dev/null -dQUIET - < ../../tools/mup/getfontinfo.ps | $(SED) -e "/Warning:/d" >> fontdata.c ++ $(GS) -dNOSAFER -sDEVICE=nullpage -sOutputFile=/dev/null -dQUIET --permit-file-write=charnames:fontinit - < ../../tools/mup/getfontinfo.ps | $(SED) -e "/Warning:/d" >> fontdata.c diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d8e66412c57..89566421a522 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12469,9 +12469,7 @@ with pkgs; mumble_overlay = (callPackages ../applications/networking/mumble { }).overlay; - mup = callPackage ../applications/audio/mup { - autoreconfHook = buildPackages.autoreconfHook269; - }; + mup = callPackage ../applications/audio/mup { }; musescore = qt6.callPackage ../applications/audio/musescore { };