diff --git a/pkgs/development/python-modules/mediafile/default.nix b/pkgs/development/python-modules/mediafile/default.nix index 5d11d253b6d9..eb7fc8ca60ff 100644 --- a/pkgs/development/python-modules/mediafile/default.nix +++ b/pkgs/development/python-modules/mediafile/default.nix @@ -1,8 +1,5 @@ { buildPythonPackage -, enum34 -, fetchpatch , fetchPypi -, isPy27 , lib , mutagen , six @@ -10,30 +7,14 @@ buildPythonPackage rec { pname = "mediafile"; - version = "0.6.0"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-o/tSAHu8FTr6LZoMHvegr9uCZovNLHS9KkP2U9y4uko="; + sha256 = "sha256-19K5DZMstRWu/6+N/McEdM1swedI5qr15kmnIAMA60Y="; }; - propagatedBuildInputs = [ mutagen six ] ++ lib.optional isPy27 enum34; - - # NB: Remove in the next release - patches = [ - (fetchpatch { - url = "https://github.com/beetbox/mediafile/commit/0ff753d493a1a7f406cb3378545ffe2c85a9afa3.patch"; - sha256 = "sha256-AQ7YedoYPmLqt4a/odgghIKOY61i9YfA0To0RVFqlk8="; - }) - (fetchpatch { - url = "https://github.com/beetbox/mediafile/commit/f0fb4e5111d9dfaa3b38d196ec41fcd237d97953.patch"; - sha256 = "sha256-5O6RiAqkQEz3Bvqjwwv/LOS33nSIBnT2H/vasGGVrpI="; - }) - (fetchpatch { - url = "https://github.com/beetbox/mediafile/commit/d2fc3b59f77c515b02dfe7ad936f89264375d2b4.patch"; - sha256 = "sha256-SMH0XhCaKLDNB4M8VmZWfGuuelfY5xladZyQYtXtP18="; - }) - ]; + propagatedBuildInputs = [ mutagen six ]; meta = with lib; { description = "MediaFile is a simple interface to the metadata tags for many audio file formats."; diff --git a/pkgs/tools/audio/beets/plugins/extrafiles.nix b/pkgs/tools/audio/beets/plugins/extrafiles.nix index 9118765cc1be..0d3ccc0d7a71 100644 --- a/pkgs/tools/audio/beets/plugins/extrafiles.nix +++ b/pkgs/tools/audio/beets/plugins/extrafiles.nix @@ -14,6 +14,7 @@ pythonPackages.buildPythonApplication rec { postPatch = '' sed -i -e '/install_requires/,/\]/{/beets/d}' setup.py sed -i -e '/namespace_packages/d' setup.py + sed -i -e 's/mediafile~=0.6.0/mediafile>=0.6.0/' setup.py ''; nativeBuildInputs = [ beets ];