diff options
| author | Fabian Affolter <fabian@affolter-engineering.ch> | 2022-11-04 10:00:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-04 10:00:57 +0100 |
| commit | 7d09cc075f416997a8e547982b652ec2c7020a5f (patch) | |
| tree | 21cfaf1e685a7d2cec615f1ddf432a7c630f5863 /pkgs/applications | |
| parent | f0bcb4c75664e6aee6e530c6db66b7d32e015a70 (diff) | |
| parent | 9c5172285d45fced2abdd6c560f6900137bb5b10 (diff) | |
Merge pull request #199419 from fabaff/mutagen-bump
python310Packages.mutagen: 1.45.1 -> 1.46.0
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/audio/puddletag/default.nix | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix index 320b837ab878f..3fa0ea533b262 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 = [ wrapQtAppsHook ]; + nativeBuildInputs = [ + python3.pkgs.pythonRelaxDepsHook + wrapQtAppsHook + ]; - propagatedBuildInputs = with python3Packages; [ - pyacoustid + propagatedBuildInputs = with python3.pkgs; [ configobj levenshtein lxml mutagen + pyacoustid pyparsing pyqt5 rapidfuzz |