From bff64d8e02fa1685b6cfbbd9e2b980f36ffd60f6 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 12 May 2022 16:46:01 +0200 Subject: [PATCH 1/3] libmt32emu: 2.5.3 -> 2.6.3 --- pkgs/applications/audio/munt/libmt32emu.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/munt/libmt32emu.nix b/pkgs/applications/audio/munt/libmt32emu.nix index f79a2667542f..58fb9cddc902 100644 --- a/pkgs/applications/audio/munt/libmt32emu.nix +++ b/pkgs/applications/audio/munt/libmt32emu.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "libmt32emu"; - version = "2.5.3"; + version = "2.6.3"; src = fetchFromGitHub { owner = "munt"; repo = "munt"; rev = "${pname}_${lib.replaceChars [ "." ] [ "_" ] version}"; - hash = "sha256-n5VV5Swh1tOVQGT3urEKl64A/w7cY95/0y5wC5ZuLm4="; + sha256 = "0ncy55fj9l2s750clxjpv102hrgcndz4qba9w2sf8lwzgy6d1xmp"; }; outputs = [ "out" "dev" ]; From 883cb64ae9d9c266bae6e19d740428505a997a66 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 12 May 2022 16:53:35 +0200 Subject: [PATCH 2/3] mt32emu-qt: 1.9.0 -> 1.10.2 --- pkgs/applications/audio/munt/mt32emu-qt.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/audio/munt/mt32emu-qt.nix b/pkgs/applications/audio/munt/mt32emu-qt.nix index 0c541885689e..c2b84fd6ed78 100644 --- a/pkgs/applications/audio/munt/mt32emu-qt.nix +++ b/pkgs/applications/audio/munt/mt32emu-qt.nix @@ -13,15 +13,18 @@ , withJack ? stdenv.hostPlatform.isUnix, libjack2 }: +let + char2underscore = char: str: lib.replaceChars [ char ] [ "_" ] str; +in mkDerivation rec { pname = "mt32emu-qt"; - version = "1.9.0"; + version = "1.10.2"; src = fetchFromGitHub { owner = "munt"; repo = "munt"; - rev = "mt32emu_qt_${lib.replaceChars [ "." ] [ "_" ] version}"; - hash = "sha256-9vapBKpl1NC3mIDetuCb452IHV6c7c7NCzSyiBry5oo="; + rev = "${char2underscore "-" pname}_${char2underscore "." version}"; + sha256 = "1dh5xpnsgx367ch45mm5c2p26vnxf3shax2afg2cd2lrbrlii7l9"; }; postPatch = '' @@ -55,8 +58,8 @@ mkDerivation rec { postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/Applications - mv $out/bin/${meta.mainProgram}.app $out/Applications/ - ln -s $out/{Applications/${meta.mainProgram}.app/Contents/MacOS,bin}/${meta.mainProgram} + mv $out/bin/${pname}.app $out/Applications/ + ln -s $out/{Applications/${pname}.app/Contents/MacOS,bin}/${pname} ''; meta = with lib; { @@ -70,6 +73,5 @@ mkDerivation rec { license = with licenses; [ gpl3Plus ]; maintainers = with maintainers; [ OPNA2608 ]; platforms = platforms.all; - mainProgram = "mt32emu-qt"; }; } From f88302aa1c0bc6f41cf2391605112c2c31a84290 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 12 May 2022 16:57:32 +0200 Subject: [PATCH 3/3] mt32emu-smf2wav: 1.7.0 -> 1.8.2 --- pkgs/applications/audio/munt/mt32emu-smf2wav.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/munt/mt32emu-smf2wav.nix b/pkgs/applications/audio/munt/mt32emu-smf2wav.nix index 378b5dd8fb83..eee9f01ebb55 100644 --- a/pkgs/applications/audio/munt/mt32emu-smf2wav.nix +++ b/pkgs/applications/audio/munt/mt32emu-smf2wav.nix @@ -7,15 +7,18 @@ , pkg-config }: +let + char2underscore = char: str: lib.replaceChars [ char ] [ "_" ] str; +in stdenv.mkDerivation rec { pname = "mt32emu-smf2wav"; - version = "1.7.0"; + version = "1.8.2"; src = fetchFromGitHub { owner = "munt"; repo = "munt"; - rev = "mt32emu_smf2wav_${lib.replaceChars [ "." ] [ "_" ] version}"; - hash = "sha256-FnKlKJxe7P4Yqpv0oVGgV4253dMgSmgtb7EAa2FI+aI="; + rev = "${char2underscore "-" pname}_${char2underscore "." version}"; + sha256 = "1dh5xpnsgx367ch45mm5c2p26vnxf3shax2afg2cd2lrbrlii7l9"; }; postPatch = '' @@ -45,6 +48,5 @@ stdenv.mkDerivation rec { license = with licenses; [ gpl3Plus ]; maintainers = with maintainers; [ OPNA2608 ]; platforms = platforms.all; - mainProgram = "mt32emu-smf2wav"; }; }