From 91beb4b016d6b680248118ae6f7d58b27ea03bed Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Tue, 17 Sep 2024 21:38:03 +0200
Subject: [PATCH] solfege: migrate to pkgs/by-name, format with
 nixfmt-rfc-style

---
 pkgs/{misc => by-name/so}/solfege/css.patch   |  0
 .../so}/solfege/menubar.patch                 |  0
 .../so/solfege/package.nix}                   | 50 ++++++++++++++-----
 .../so}/solfege/texinfo.patch                 |  0
 .../so}/solfege/webbrowser.patch              |  0
 pkgs/top-level/all-packages.nix               |  2 -
 6 files changed, 37 insertions(+), 15 deletions(-)
 rename pkgs/{misc => by-name/so}/solfege/css.patch (100%)
 rename pkgs/{misc => by-name/so}/solfege/menubar.patch (100%)
 rename pkgs/{misc/solfege/default.nix => by-name/so/solfege/package.nix} (67%)
 rename pkgs/{misc => by-name/so}/solfege/texinfo.patch (100%)
 rename pkgs/{misc => by-name/so}/solfege/webbrowser.patch (100%)

diff --git a/pkgs/misc/solfege/css.patch b/pkgs/by-name/so/solfege/css.patch
similarity index 100%
rename from pkgs/misc/solfege/css.patch
rename to pkgs/by-name/so/solfege/css.patch
diff --git a/pkgs/misc/solfege/menubar.patch b/pkgs/by-name/so/solfege/menubar.patch
similarity index 100%
rename from pkgs/misc/solfege/menubar.patch
rename to pkgs/by-name/so/solfege/menubar.patch
diff --git a/pkgs/misc/solfege/default.nix b/pkgs/by-name/so/solfege/package.nix
similarity index 67%
rename from pkgs/misc/solfege/default.nix
rename to pkgs/by-name/so/solfege/package.nix
index 09964fd58bcc..d3c8d113f75c 100644
--- a/pkgs/misc/solfege/default.nix
+++ b/pkgs/by-name/so/solfege/package.nix
@@ -1,17 +1,34 @@
-{ lib, fetchurl, gettext, pkg-config, texinfo, wrapGAppsHook3
-, buildPythonApplication, pycairo, pygobject3
-, gdk-pixbuf, gobject-introspection, gtk3, librsvg
-, alsa-utils, timidity, mpg123, vorbis-tools, csound, lilypond
-, automake, autoconf, txt2man
+{
+  lib,
+  alsa-utils,
+  autoconf,
+  automake,
+  csound,
+  fetchurl,
+  gdk-pixbuf,
+  gettext,
+  gobject-introspection,
+  gtk3,
+  librsvg,
+  lilypond,
+  mpg123,
+  pkg-config,
+  python3Packages,
+  texinfo,
+  timidity,
+  txt2man,
+  vorbis-tools,
+  wrapGAppsHook3,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "solfege";
   version = "3.23.4";
+  format = "other";
 
   src = fetchurl {
     url = "https://alpha.gnu.org/gnu/solfege/solfege-${version}.tar.gz";
-    sha256 = "0sc17vf4xz6gy0s0z9ghi68yskikdmyb4gdaxx6imrm40734k8mp";
+    hash = "sha256-t6JJxgGk5hpN76o9snxtM07tkYnwpQ808M/8Ttw+gWk=";
   };
 
   patches = [
@@ -27,15 +44,14 @@ buildPythonApplication rec {
   '';
 
   nativeBuildInputs = [
-    automake
     autoconf
+    automake
     gdk-pixbuf
     gettext
+    gobject-introspection
     pkg-config
     texinfo
     txt2man
-
-    gobject-introspection
     wrapGAppsHook3
   ];
 
@@ -44,7 +60,7 @@ buildPythonApplication rec {
     librsvg
   ];
 
-  propagatedBuildInputs = [
+  propagatedBuildInputs = with python3Packages; [
     pycairo
     pygobject3
   ];
@@ -59,7 +75,11 @@ buildPythonApplication rec {
            default.config
   '';
 
-  format = "other";
+  dontWrapGApps = true;
+
+  preFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
 
   enableParallelBuilding = true;
 
@@ -68,7 +88,11 @@ buildPythonApplication rec {
     homepage = "https://www.gnu.org/software/solfege/";
     license = licenses.gpl3Only;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ bjornfor orivej anthonyroussel ];
+    maintainers = with maintainers; [
+      bjornfor
+      orivej
+      anthonyroussel
+    ];
     mainProgram = "solfege";
   };
 }
diff --git a/pkgs/misc/solfege/texinfo.patch b/pkgs/by-name/so/solfege/texinfo.patch
similarity index 100%
rename from pkgs/misc/solfege/texinfo.patch
rename to pkgs/by-name/so/solfege/texinfo.patch
diff --git a/pkgs/misc/solfege/webbrowser.patch b/pkgs/by-name/so/solfege/webbrowser.patch
similarity index 100%
rename from pkgs/misc/solfege/webbrowser.patch
rename to pkgs/by-name/so/solfege/webbrowser.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b743ce995bf7..3ce3bd6b76d1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -38066,8 +38066,6 @@ with pkgs;
 
   nvd = callPackage ../tools/package-management/nvd { };
 
-  solfege = python3Packages.callPackage ../misc/solfege { };
-
   disnix = callPackage ../tools/package-management/disnix { };
 
   dysnomia = callPackage ../tools/package-management/disnix/dysnomia (config.disnix or {