diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix index 320b837ab878..3fa0ea533b26 100644 --- a/pkgs/applications/audio/puddletag/default.nix +++ b/pkgs/applications/audio/puddletag/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitHub, python3Packages, wrapQtAppsHook }: +{ lib +, fetchFromGitHub +, python3 +, wrapQtAppsHook +}: # As of 2.1, puddletag has started pinning versions of all dependencies that it # was built against which is an issue as the chances of us having the exact same @@ -14,18 +18,11 @@ # ignoring the pinned versions, it's just something we will have to accept # unless we want to vendor those versions. -let - # NOTE: check if we can drop any of these overrides when bumping the version - overrideVersions = [ - "lxml" - "pyparsing" - "pyqt5" - ]; -in -python3Packages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "puddletag"; version = "2.2.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "puddletag"; @@ -34,26 +31,29 @@ python3Packages.buildPythonApplication rec { hash = "sha256-KaFfpOWI9u2ZC/3kuCLneWOOKSmAaIuHPFHptkKMH/g="; }; + pythonRelaxDeps = true; + + pythonRemoveDeps = [ + "chromaprint" + "pyqt5-qt5" + ]; + postPatch = '' substituteInPlace setup.py \ --replace share/pixmaps share/icons + ''; - cp requirements.in requirements.txt - sed -i requirements.txt -e 's/^chromaprint$//' - '' + lib.concatMapStringsSep "\n" - (e: '' - sed -i requirements.txt -e 's/^${e}.*/${e}/' - '') - overrideVersions; + nativeBuildInputs = [ + python3.pkgs.pythonRelaxDepsHook + wrapQtAppsHook + ]; - nativeBuildInputs = [ wrapQtAppsHook ]; - - propagatedBuildInputs = with python3Packages; [ - pyacoustid + propagatedBuildInputs = with python3.pkgs; [ configobj levenshtein lxml mutagen + pyacoustid pyparsing pyqt5 rapidfuzz diff --git a/pkgs/development/python-modules/mediafile/default.nix b/pkgs/development/python-modules/mediafile/default.nix index c71bf3214b2c..1e09a5e489ab 100644 --- a/pkgs/development/python-modules/mediafile/default.nix +++ b/pkgs/development/python-modules/mediafile/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "mediafile"; - version = "0.10.0"; + version = "0.10.1"; format = "flit"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "beetbox"; repo = pname; rev = "v${version}"; - hash = "sha256-Sdb5Hvm4Y344msZGie4PJ88ZmFtWfc0chABtmwnEN/Y="; + hash = "sha256-2h17FA0GTY4R+WhZiQtPFYf6gH7XLbI3aOB/nUXFtJI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mutagen/default.nix b/pkgs/development/python-modules/mutagen/default.nix index 835a9d8861a2..78dbb73a00e1 100644 --- a/pkgs/development/python-modules/mutagen/default.nix +++ b/pkgs/development/python-modules/mutagen/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "mutagen"; - version = "1.45.1"; + version = "1.46.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "6397602efb3c2d7baebd2166ed85731ae1c1d475abca22090b7141ff5034b3e1"; + hash = "sha256-bl+LqEg2uZ/mC+X7J/hL5K2Rm7trScqmroHnBYS1Xlg="; }; outputs = [ "out" "doc" ]; @@ -44,11 +44,13 @@ buildPythonPackage rec { disabledTests = [ # Hypothesis produces unreliable results: Falsified on the first call but did not on a subsequent one "test_test_fileobj_save" + "test_test_fileobj_load" + "test_test_fileobj_delete" + "test_mock_fileobj" ]; - disabledTestPaths = [ - # we are not interested in code quality measurements - "tests/quality/test_flake8.py" + pythonImportsCheck = [ + "mutagen" ]; meta = with lib; { @@ -66,5 +68,6 @@ buildPythonPackage rec { homepage = "https://mutagen.readthedocs.io"; changelog = "https://mutagen.readthedocs.io/en/latest/changelog.html#release-${lib.replaceStrings [ "." ] [ "-" ] version}"; license = licenses.gpl2Plus; + maintainers = with maintainers; [ ]; }; }