From 571322fee4f7ac2ca6e4b394292a0688cb3a2d8d Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Thu, 28 Mar 2024 14:33:18 +0100 Subject: [PATCH] python3Packages.pyogg: 0.6.9a1 > 0.6.14a1 --- .../python-modules/pyogg/default.nix | 83 ++++++++++++------- 1 file changed, 55 insertions(+), 28 deletions(-) diff --git a/pkgs/development/python-modules/pyogg/default.nix b/pkgs/development/python-modules/pyogg/default.nix index 22a602df273a..77f63870a296 100644 --- a/pkgs/development/python-modules/pyogg/default.nix +++ b/pkgs/development/python-modules/pyogg/default.nix @@ -1,37 +1,64 @@ -{ stdenv, lib, fetchPypi, buildPythonPackage, libvorbis, flac, libogg, libopus, opusfile, substituteAll }: +{ stdenv +, lib +, fetchPypi +, buildPythonPackage +, libvorbis +, flac +, libogg +, libopus +, opusfile +, substituteAll +, python +}: buildPythonPackage rec { - pname = "pyogg"; - version = "0.6.9a1"; - src = fetchPypi { - pname = "PyOgg"; - inherit version; - sha256 = "0xabqwyknpvfc53s7il5pq6b07fcaqvz5bi5vbs3pbaw8602qvim"; - }; + pname = "pyogg"; + version = "0.6.14a1"; - buildInputs = [ libvorbis flac libogg libopus ]; - propagatedBuidInputs = [ libvorbis flac libogg libopus opusfile ]; - # There are no tests in this package. - doCheck = false; - patchFlags = [ "-p1" "--binary" ]; # patch has dos style eol - patches = [ - (substituteAll { - src = ./pyogg-paths.patch; - flacLibPath="${flac.out}/lib/libFLAC${stdenv.hostPlatform.extensions.sharedLibrary}"; - oggLibPath="${libogg}/lib/libogg${stdenv.hostPlatform.extensions.sharedLibrary}"; - vorbisLibPath="${libvorbis}/lib/libvorbis${stdenv.hostPlatform.extensions.sharedLibrary}"; - vorbisFileLibPath="${libvorbis}/lib/libvorbisfile${stdenv.hostPlatform.extensions.sharedLibrary}"; - vorbisEncLibPath="${libvorbis}/lib/libvorbisenc${stdenv.hostPlatform.extensions.sharedLibrary}"; - opusLibPath="${libopus}/lib/libopus${stdenv.hostPlatform.extensions.sharedLibrary}"; - opusFileLibPath="${opusfile}/lib/libopusfile${stdenv.hostPlatform.extensions.sharedLibrary}"; - }) - ]; + src = fetchPypi { + pname = "PyOgg"; + inherit version; + hash = "sha256-gpSzSqWckCAMRjDCzEpbhEByCRQejl0GnXpb41jpQmI="; + }; - meta = { + buildInputs = [ + libvorbis + flac + libogg + libopus + ]; + + propagatedBuidInputs = [ + libvorbis + flac + libogg + libopus + opusfile + ]; + + # There are no tests in this package. + doCheck = false; + + # patch has dos style eol + patchFlags = [ "-p1" "--binary" ]; + patches = [ + (substituteAll { + src = ./pyogg-paths.patch; + flacLibPath="${flac.out}/lib/libFLAC${stdenv.hostPlatform.extensions.sharedLibrary}"; + oggLibPath="${libogg}/lib/libogg${stdenv.hostPlatform.extensions.sharedLibrary}"; + vorbisLibPath="${libvorbis}/lib/libvorbis${stdenv.hostPlatform.extensions.sharedLibrary}"; + vorbisFileLibPath="${libvorbis}/lib/libvorbisfile${stdenv.hostPlatform.extensions.sharedLibrary}"; + vorbisEncLibPath="${libvorbis}/lib/libvorbisenc${stdenv.hostPlatform.extensions.sharedLibrary}"; + opusLibPath="${libopus}/lib/libopus${stdenv.hostPlatform.extensions.sharedLibrary}"; + opusFileLibPath="${opusfile}/lib/libopusfile${stdenv.hostPlatform.extensions.sharedLibrary}"; + }) + ]; + + meta = with lib; { description = "Xiph.org's Ogg Vorbis, Opus and FLAC for Python"; homepage = "https://github.com/Zuzu-Typ/PyOgg"; - license = lib.licenses.publicDomain; - maintainers = with lib.maintainers; [ pmiddend ]; + license = licenses.publicDomain; + maintainers = with maintainers; [ pmiddend ]; }; }