From e0e69f2d76227a3706efb73dcff5b13b8a125b44 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Thu, 5 Dec 2024 22:29:14 +0100
Subject: [PATCH 1/3] milkytracker: 1.04.00 -> 1.05.01

---
 pkgs/applications/audio/milkytracker/default.nix | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix
index b792c1ad9b49..6fea98975d88 100644
--- a/pkgs/applications/audio/milkytracker/default.nix
+++ b/pkgs/applications/audio/milkytracker/default.nix
@@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, fetchpatch
 , gitUpdater
 , alsa-lib
 , cmake
@@ -21,24 +20,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "milkytracker";
-  version = "1.04.00";
+  version = "1.05.01";
 
   src = fetchFromGitHub {
     owner = "milkytracker";
     repo = "MilkyTracker";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ta4eV/FGBfgTppJwDam0OKQ7udtlinbWly/FPCE+Qss=";
+    hash = "sha256-31Jy93bQj9wZ9vWJe5DVnBqFXfPSH1qmk8kcT/t+FY0=";
   };
 
-  patches = [
-    # Fix crash after querying midi ports
-    # Remove when version > 1.04.00
-    (fetchpatch {
-      url = "https://github.com/milkytracker/MilkyTracker/commit/7e9171488fc47ad2de646a4536794fda21e7303d.patch";
-      hash = "sha256-CmnIwmGGnsnlRrvVAXe2zaQf1CFMB5BJPKmiwGOHgGY=";
-    })
-  ];
-
   strictDeps = true;
 
   nativeBuildInputs = [
@@ -66,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
   postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
     install -Dm644 $src/resources/milkytracker.desktop $out/share/applications/milkytracker.desktop
     install -Dm644 $src/resources/pictures/carton.png $out/share/pixmaps/milkytracker.png
-    install -Dm644 $src/resources/milkytracker.appdata $out/share/appdata/milkytracker.appdata.xml
+    install -Dm644 $src/resources/org.milkytracker.MilkyTracker.metainfo.xml $out/share/appdata/org.milkytracker.MilkyTracker.metainfo.xml
   '';
 
   passthru.updateScript = gitUpdater {

From 089f7815b4b1c1bb04b534ffe075ded242d010e5 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Thu, 5 Dec 2024 22:34:45 +0100
Subject: [PATCH 2/3] milkytracker: Modernise

- nixfmt
- Drop meta-wide "with lib"
- Darwin frameworks are stdenv-provided now
---
 .../audio/milkytracker/default.nix            | 68 +++++++++----------
 1 file changed, 31 insertions(+), 37 deletions(-)

diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix
index 6fea98975d88..526756b31b8c 100644
--- a/pkgs/applications/audio/milkytracker/default.nix
+++ b/pkgs/applications/audio/milkytracker/default.nix
@@ -1,21 +1,18 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, gitUpdater
-, alsa-lib
-, cmake
-, Cocoa
-, CoreAudio
-, Foundation
-, libjack2
-, lhasa
-, makeWrapper
-, perl
-, pkg-config
-, rtmidi
-, SDL2
-, zlib
-, zziplib
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  gitUpdater,
+  alsa-lib,
+  cmake,
+  libjack2,
+  lhasa,
+  makeWrapper,
+  pkg-config,
+  rtmidi,
+  SDL2,
+  zlib,
+  zziplib,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -37,21 +34,18 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs = [
-    lhasa
-    libjack2
-    perl
-    rtmidi
-    SDL2
-    zlib
-    zziplib
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [
-    alsa-lib
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    Cocoa
-    CoreAudio
-    Foundation
-  ];
+  buildInputs =
+    [
+      lhasa
+      libjack2
+      rtmidi
+      SDL2
+      zlib
+      zziplib
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      alsa-lib
+    ];
 
   postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
     install -Dm644 $src/resources/milkytracker.desktop $out/share/applications/milkytracker.desktop
@@ -63,14 +57,14 @@ stdenv.mkDerivation (finalAttrs: {
     rev-prefix = "v";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Music tracker application, similar to Fasttracker II";
     homepage = "https://milkytracker.org/";
-    license = licenses.gpl3Plus;
-    platforms = platforms.unix;
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.unix;
     # ibtool -> real Xcode -> I can't get that, and Ofborg can't test that
     broken = stdenv.hostPlatform.isDarwin;
-    maintainers = with maintainers; [ OPNA2608 ];
+    maintainers = with lib.maintainers; [ OPNA2608 ];
     mainProgram = "milkytracker";
   };
 })

From 56262ecfd3f87bf6b47d70c9ca871dbcfe8ae07b Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Thu, 5 Dec 2024 22:41:07 +0100
Subject: [PATCH 3/3] milkytracker: Migrate to by-name

---
 .../default.nix => by-name/mi/milkytracker/package.nix}       | 0
 pkgs/top-level/all-packages.nix                               | 4 ----
 2 files changed, 4 deletions(-)
 rename pkgs/{applications/audio/milkytracker/default.nix => by-name/mi/milkytracker/package.nix} (100%)

diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/by-name/mi/milkytracker/package.nix
similarity index 100%
rename from pkgs/applications/audio/milkytracker/default.nix
rename to pkgs/by-name/mi/milkytracker/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1b8ef4e29fec..bf12e6681748 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13284,10 +13284,6 @@ with pkgs;
       stdenv;
   };
 
-  milkytracker = callPackage ../applications/audio/milkytracker {
-    inherit (darwin.apple_sdk.frameworks) Cocoa CoreAudio Foundation;
-  };
-
   ptcollab = callPackage ../by-name/pt/ptcollab/package.nix {
     stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
   };