lol

Merge pull request #12899: beets: 1.3.16 -> 1.3.17

This contains the update from @Profpatsch and a small fix by me to
re-enable the test suite.

The upstream changelog can be found at:

http://beets.readthedocs.org/en/v1.3.17/changelog.html

aszlig 0afbe4c4 06ce6ba7

+19 -15
+19 -15
pkgs/tools/audio/beets/default.nix
··· 1 1 { stdenv, fetchFromGitHub, writeScript, glibcLocales 2 2 , buildPythonPackage, pythonPackages, python, imagemagick 3 3 4 - , enableAcoustid ? true 5 - , enableBadfiles ? true, flac ? null, mp3val ? null 6 - , enableDiscogs ? true 7 - , enableEchonest ? true 8 - , enableEmbyupdate ? true 9 - , enableFetchart ? true 10 - , enableLastfm ? true 11 - , enableMpd ? true 12 - , enableReplaygain ? true, bs1770gain ? null 13 - , enableThumbnails ? true 14 - , enableWeb ? true 4 + , enableAcousticbrainz ? true 5 + , enableAcoustid ? true 6 + , enableBadfiles ? true, flac ? null, mp3val ? null 7 + , enableDiscogs ? true 8 + , enableEchonest ? true 9 + , enableEmbyupdate ? true 10 + , enableFetchart ? true 11 + , enableLastfm ? true 12 + , enableMpd ? true 13 + , enableReplaygain ? true, bs1770gain ? null 14 + , enableThumbnails ? true 15 + , enableWeb ? true 15 16 16 17 # External plugins 17 18 , enableAlternatives ? false ··· 34 35 35 36 let 36 37 optionalPlugins = { 38 + acousticbrainz = enableAcousticbrainz; 37 39 badfiles = enableBadfiles; 38 40 chroma = enableAcoustid; 39 41 discogs = enableDiscogs; ··· 68 70 69 71 in buildPythonPackage rec { 70 72 name = "beets-${version}"; 71 - version = "1.3.16"; 73 + version = "1.3.17"; 72 74 namePrefix = ""; 73 75 74 76 src = fetchFromGitHub { 75 77 owner = "sampsyo"; 76 78 repo = "beets"; 77 79 rev = "v${version}"; 78 - sha256 = "1grjcgr419yq756wwxjpzyfjdf8n51bg6i0agm465lb7l3jgqy6k"; 80 + sha256 = "1fskxx5xxjqf4xmfjrinh7idjiq6qncb24hiyccv09l47fr1yipc"; 79 81 }; 80 82 81 83 propagatedBuildInputs = [ ··· 91 93 python.modules.readline 92 94 ] ++ optional enableAcoustid pythonPackages.pyacoustid 93 95 ++ optional (enableFetchart 94 - || enableEmbyupdate) pythonPackages.requests2 96 + || enableEmbyupdate 97 + || enableAcousticbrainz) 98 + pythonPackages.requests2 95 99 ++ optional enableDiscogs pythonPackages.discogs_client 96 100 ++ optional enableEchonest pythonPackages.pyechonest 97 101 ++ optional enableLastfm pythonPackages.pylast ··· 117 121 118 122 postPatch = '' 119 123 sed -i -e '/assertIn.*item.*path/d' test/test_info.py 120 - echo echo completion tests passed > test/test_completion.sh 124 + echo echo completion tests passed > test/rsrc/test_completion.sh 121 125 122 126 sed -i -e '/^BASH_COMPLETION_PATHS *=/,/^])$/ { 123 127 /^])$/i u"${completion}"