Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

tauon: 7.9.0 -> 8.0.1

+49 -13
+15
pkgs/by-name/ta/tauon/install_mode_true.patch
··· 1 + diff --git a/src/tauon/__main__.py b/src/tauon/__main__.py 2 + index 04691586..e48afa02 100755 3 + --- a/src/tauon/__main__.py 4 + +++ b/src/tauon/__main__.py 5 + @@ -115,8 +115,8 @@ def transfer_args_and_exit() -> None: 6 + if "--no-start" in sys.argv: 7 + transfer_args_and_exit() 8 + 9 + -# If we're installed, use home data locations 10 + -install_mode = bool(str(install_directory).startswith(("/opt/", "/usr/", "/app/", "/snap/")) or sys.platform in ("darwin", "win32")) 11 + +# Nixpkgs install, use home data dirs. 12 + +install_mode = True 13 + 14 + # Assume that it's a classic Linux install, use standard paths 15 + if str(install_directory).startswith("/usr/") and Path("/usr/share/TauonMusicBox").is_dir():
+34 -13
pkgs/by-name/ta/tauon/package.nix
··· 2 2 lib, 3 3 stdenv, 4 4 fetchFromGitHub, 5 + fetchPypi, 5 6 kissfft, 6 7 miniaudio, 7 8 pkg-config, ··· 16 17 librsvg, 17 18 libsamplerate, 18 19 libvorbis, 20 + xorg, 19 21 mpg123, 20 22 opusfile, 21 23 pango, ··· 26 28 withDiscordRPC ? true, 27 29 }: 28 30 31 + let 32 + # fork of pypresence, to be reverted if/when there's an upstream release 33 + lynxpresence = python3Packages.buildPythonPackage rec { 34 + pname = "lynxpresence"; 35 + version = "4.4.1"; 36 + format = "setuptools"; 37 + 38 + src = fetchPypi { 39 + inherit pname version; 40 + hash = "sha256-y/KboyhEGs9RvyKayEIQu2+WaiQNOdsHDl1/pEoqEkQ="; 41 + }; 42 + 43 + doCheck = false; # tests require internet connection 44 + pythonImportsCheck = [ "lynxpresence" ]; 45 + }; 46 + in 29 47 python3Packages.buildPythonApplication rec { 30 48 pname = "tauon"; 31 - version = "7.9.0"; 49 + version = "8.0.1"; 32 50 pyproject = true; 33 51 34 52 src = fetchFromGitHub { 35 53 owner = "Taiko2k"; 36 54 repo = "Tauon"; 37 55 tag = "v${version}"; 38 - hash = "sha256-6aEUniLoE5Qtfht3OAe+zvC9yZwjH+KpskmjGowDuuU="; 56 + hash = "sha256-m94/zdlJu/u/dchIXhqB47bkl6Uej2hVr8R6RNg8Vaw="; 39 57 }; 40 58 41 59 postUnpack = '' ··· 46 64 ln -s ${miniaudio.src} source/src/phazor/miniaudio 47 65 ''; 48 66 67 + patches = [ 68 + ./install_mode_true.patch 69 + ]; 70 + 49 71 postPatch = '' 50 - substituteInPlace src/tauon/__main__.py \ 51 - --replace-fail 'install_mode = False' 'install_mode = True' 52 - 53 72 substituteInPlace src/tauon/t_modules/t_phazor.py \ 54 73 --replace-fail 'base_path = Path(pctl.install_directory).parent.parent / "build"' 'base_path = Path("${placeholder "out"}/${python3Packages.python.sitePackages}")' 55 74 ''; 56 75 57 76 pythonRemoveDeps = [ 58 - "pysdl2-dll" 59 77 "opencc" 60 78 "tekore" 61 79 ]; ··· 105 123 pychromecast 106 124 pylast 107 125 pygobject3 108 - pysdl2 126 + pysdl3 109 127 requests 110 128 send2trash 111 129 setproctitle 112 130 tidalapi 113 131 ] 114 - ++ lib.optional withDiscordRPC pypresence 132 + ++ lib.optional withDiscordRPC lynxpresence 115 133 ++ lib.optional stdenv.hostPlatform.isLinux pulsectl; 116 134 117 135 makeWrapperArgs = [ 118 136 "--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}" 119 137 "--prefix LD_LIBRARY_PATH : ${ 120 - lib.makeLibraryPath [ 121 - game-music-emu 122 - libopenmpt 123 - pulseaudio 124 - ] 138 + lib.makeLibraryPath ( 139 + [ 140 + game-music-emu 141 + libopenmpt 142 + pulseaudio 143 + ] 144 + ++ lib.optional stdenv.hostPlatform.isLinux xorg.libXcursor 145 + ) 125 146 }" 126 147 "--prefix PYTHONPATH : $out/share/tauon" 127 148 "--set GI_TYPELIB_PATH $GI_TYPELIB_PATH"