nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix

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 = [ ··· 44 27 ''; 45 28 46 29 nativeBuildInputs = [ 47 - automake 48 30 autoconf 31 + automake 49 32 gdk-pixbuf 50 33 gettext 34 + gobject-introspection 51 35 pkg-config 52 36 texinfo 53 37 txt2man 54 - 55 - gobject-introspection 56 38 wrapGAppsHook3 57 39 ]; 58 40 ··· 60 44 librsvg 61 45 ]; 62 46 63 - propagatedBuildInputs = [ 47 + propagatedBuildInputs = with python3Packages; [ 64 48 pycairo 65 49 pygobject3 66 50 ]; ··· 75 59 default.config 76 60 ''; 77 61 78 - format = "other"; 62 + dontWrapGApps = true; 63 + 64 + preFixup = '' 65 + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") 66 + ''; 79 67 80 68 enableParallelBuilding = true; 81 69 ··· 88 68 homepage = "https://www.gnu.org/software/solfege/"; 89 69 license = licenses.gpl3Only; 90 70 platforms = platforms.linux; 91 - maintainers = with maintainers; [ bjornfor orivej anthonyroussel ]; 71 + maintainers = with maintainers; [ 72 + bjornfor 73 + orivej 74 + anthonyroussel 75 + ]; 92 76 mainProgram = "solfege"; 93 77 }; 94 78 }
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 {