lol

solfege: migrate to pkgs/by-name, format with nixfmt-rfc-style

+37 -15
pkgs/misc/solfege/css.patch pkgs/by-name/so/solfege/css.patch
+37 -13
pkgs/misc/solfege/default.nix pkgs/by-name/so/solfege/package.nix
··· 1 - { lib, fetchurl, gettext, pkg-config, texinfo, wrapGAppsHook3 2 - , buildPythonApplication, pycairo, pygobject3 3 - , gdk-pixbuf, gobject-introspection, gtk3, librsvg 4 - , alsa-utils, timidity, mpg123, vorbis-tools, csound, lilypond 5 - , automake, autoconf, txt2man 1 + { 2 + lib, 3 + alsa-utils, 4 + autoconf, 5 + automake, 6 + csound, 7 + fetchurl, 8 + gdk-pixbuf, 9 + gettext, 10 + gobject-introspection, 11 + gtk3, 12 + librsvg, 13 + lilypond, 14 + mpg123, 15 + pkg-config, 16 + python3Packages, 17 + texinfo, 18 + timidity, 19 + txt2man, 20 + vorbis-tools, 21 + wrapGAppsHook3, 6 22 }: 7 23 8 - buildPythonApplication rec { 24 + python3Packages.buildPythonApplication rec { 9 25 pname = "solfege"; 10 26 version = "3.23.4"; 27 + format = "other"; 11 28 12 29 src = fetchurl { 13 30 url = "https://alpha.gnu.org/gnu/solfege/solfege-${version}.tar.gz"; 14 - sha256 = "0sc17vf4xz6gy0s0z9ghi68yskikdmyb4gdaxx6imrm40734k8mp"; 31 + hash = "sha256-t6JJxgGk5hpN76o9snxtM07tkYnwpQ808M/8Ttw+gWk="; 15 32 }; 16 33 17 34 patches = [ ··· 27 44 ''; 28 45 29 46 nativeBuildInputs = [ 47 + autoconf 30 48 automake 31 - autoconf 32 49 gdk-pixbuf 33 50 gettext 51 + gobject-introspection 34 52 pkg-config 35 53 texinfo 36 54 txt2man 37 - 38 - gobject-introspection 39 55 wrapGAppsHook3 40 56 ]; 41 57 ··· 44 60 librsvg 45 61 ]; 46 62 47 - propagatedBuildInputs = [ 63 + propagatedBuildInputs = with python3Packages; [ 48 64 pycairo 49 65 pygobject3 50 66 ]; ··· 59 75 default.config 60 76 ''; 61 77 62 - format = "other"; 78 + dontWrapGApps = true; 79 + 80 + preFixup = '' 81 + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") 82 + ''; 63 83 64 84 enableParallelBuilding = true; 65 85 ··· 68 88 homepage = "https://www.gnu.org/software/solfege/"; 69 89 license = licenses.gpl3Only; 70 90 platforms = platforms.linux; 71 - maintainers = with maintainers; [ bjornfor orivej anthonyroussel ]; 91 + maintainers = with maintainers; [ 92 + bjornfor 93 + orivej 94 + anthonyroussel 95 + ]; 72 96 mainProgram = "solfege"; 73 97 }; 74 98 }
pkgs/misc/solfege/menubar.patch pkgs/by-name/so/solfege/menubar.patch
pkgs/misc/solfege/texinfo.patch pkgs/by-name/so/solfege/texinfo.patch
pkgs/misc/solfege/webbrowser.patch pkgs/by-name/so/solfege/webbrowser.patch
-2
pkgs/top-level/all-packages.nix
··· 38066 38066 38067 38067 nvd = callPackage ../tools/package-management/nvd { }; 38068 38068 38069 - solfege = python3Packages.callPackage ../misc/solfege { }; 38070 - 38071 38069 disnix = callPackage ../tools/package-management/disnix { }; 38072 38070 38073 38071 dysnomia = callPackage ../tools/package-management/disnix/dysnomia (config.disnix or {