git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #115446 from lovesegfault/beets-unstable-update

beets: unstable-2021-01-29 -> unstable-2021-03-08

commit5e76186db471a9e7d369ba22d3bbb03c67a5fd5f authorBernardo Meurer <bernardo@meurer.org> dateMon 8 Mar 2021, 21:44 (6 years ago) parent4d1e4a3a2492b0
4 files changed+28−82
pkgs/tools/audio/beets/default.nix+28−28 pkgs/tools/audio/beets/plugins/check-tests.patch−17 pkgs/tools/audio/beets/plugins/check.nix−36 pkgs/top-level/all-packages.nix−1
pkgs/tools/audio/beets/default.nix+28−28
@@ -8,6 +8,7 @@
88, enableAbsubmit ? lib.elem stdenv.hostPlatform.system essentia-extractor.meta.platforms, essentia-extractor
99, enableAcousticbrainz ? true
1010, enableAcoustid ? true
11+, enableAura ? true
1112, enableBadfiles ? true, flac, mp3val
1213, enableBeatport ? true
1314, enableBpsync ? true
@@ -31,7 +32,6 @@
3132
3233# External plugins
3334, enableAlternatives ? false
34−, enableCheck ? false, liboggz
3535, enableCopyArtifacts ? false
3636, enableExtraFiles ? false
3737
@@ -44,6 +44,7 @@ let
4444 optionalPlugins = {
4545 absubmit = enableAbsubmit;
4646 acousticbrainz = enableAcousticbrainz;
47+ aura = enableAura;
4748 badfiles = enableBadfiles;
4849 beatport = enableBeatport;
4950 bpsync = enableBpsync;
@@ -102,13 +103,13 @@ in pythonPackages.buildPythonApplication rec {
102103 # unstable does not require bs1770gain[2].
103104 # [1]: https://discourse.beets.io/t/forming-a-beets-core-team/639
104105 # [2]: https://github.com/NixOS/nixpkgs/pull/90504
105− version = "unstable-2021-01-29";
106+ version = "unstable-2021-03-08";
106107
107108 src = fetchFromGitHub {
108109 owner = "beetbox";
109110 repo = "beets";
110− rev = "04ea754d00e2873ae9aa2d9e07c5cefd790eaee2";
111− sha256 = "sha256-BIa3hnOsBxThbA2WCE4q9eaFNtObr3erZBBqobVOSiQ=";
111+ rev = "debd382837ef1d30574c2234710d536bb299f979";
112+ sha256 = "sha256-I6ejW3f72fdzWoz7g4n8pDYz2NiHGrorLegUQhQOSiI=";
112113 };
113114
114115 propagatedBuildInputs = [
@@ -126,31 +127,30 @@ in pythonPackages.buildPythonApplication rec {
126127 pythonPackages.confuse
127128 pythonPackages.mediafile
128129 gobject-introspection
129− ] ++ lib.optional enableAbsubmit essentia-extractor
130− ++ lib.optional enableAcoustid pythonPackages.pyacoustid
131− ++ lib.optional enableBeatport pythonPackages.requests_oauthlib
130+ ] ++ lib.optional enableAbsubmit essentia-extractor
131+ ++ lib.optional enableAcoustid pythonPackages.pyacoustid
132+ ++ lib.optional enableBeatport pythonPackages.requests_oauthlib
132133 ++ lib.optional (enableFetchart
133− || enableDeezer
134− || enableEmbyupdate
135− || enableKodiupdate
136− || enableLoadext
137− || enablePlaylist
138− || enableSubsonicplaylist
139− || enableSubsonicupdate
140− || enableAcousticbrainz)
141− pythonPackages.requests
142− ++ lib.optional enableCheck beetsExternalPlugins.check
143− ++ lib.optional enableConvert ffmpeg
144− ++ lib.optional enableDiscogs pythonPackages.discogs_client
145− ++ lib.optional enableKeyfinder keyfinder-cli
146− ++ lib.optional enableLastfm pythonPackages.pylast
147− ++ lib.optional enableMpd pythonPackages.mpd2
148− ++ lib.optional enableSonosUpdate pythonPackages.soco
149− ++ lib.optional enableThumbnails pythonPackages.pyxdg
150− ++ lib.optional enableWeb pythonPackages.flask
151− ++ lib.optional enableAlternatives beetsExternalPlugins.alternatives
152− ++ lib.optional enableCopyArtifacts beetsExternalPlugins.copyartifacts
153− ++ lib.optional enableExtraFiles beetsExternalPlugins.extrafiles
134+ || enableDeezer
135+ || enableEmbyupdate
136+ || enableKodiupdate
137+ || enableLoadext
138+ || enablePlaylist
139+ || enableSubsonicplaylist
140+ || enableSubsonicupdate
141+ || enableAcousticbrainz) pythonPackages.requests
142+ ++ lib.optional enableConvert ffmpeg
143+ ++ lib.optional enableDiscogs pythonPackages.discogs_client
144+ ++ lib.optional enableKeyfinder keyfinder-cli
145+ ++ lib.optional enableLastfm pythonPackages.pylast
146+ ++ lib.optional enableMpd pythonPackages.mpd2
147+ ++ lib.optional enableSonosUpdate pythonPackages.soco
148+ ++ lib.optional enableThumbnails pythonPackages.pyxdg
149+ ++ lib.optional (enableAura
150+ || enableWeb) pythonPackages.flask
151+ ++ lib.optional enableAlternatives beetsExternalPlugins.alternatives
152+ ++ lib.optional enableCopyArtifacts beetsExternalPlugins.copyartifacts
153+ ++ lib.optional enableExtraFiles beetsExternalPlugins.extrafiles
154154 ;
155155
156156 buildInputs = [
pkgs/tools/audio/beets/plugins/check-tests.patchdeleted−17
@@ -1,17 +0,0 @@
1−diff --git a/test/cli_test.py b/test/cli_test.py
2−index 26df140..2eb913c 100644
3−--- a/test/cli_test.py
4−+++ b/test/cli_test.py
5−@@ -372,12 +372,6 @@ class ToolListTest(TestHelper, TestCase):
6− self.assertIn('flac', stdout.getvalue())
7− self.assertIn('oggz-validate', stdout.getvalue())
8−
9−- def test_found_mp3val(self):
10−- shutil.copy('/bin/echo', os.path.join(self.temp_dir, 'mp3val'))
11−- with captureStdout() as stdout:
12−- beets.ui._raw_main(['check', '--list-tools'])
13−- self.assertRegexpMatches(stdout.getvalue(), r'mp3val *found')
14−-
15− def test_oggz_validate_not_found(self):
16− with captureStdout() as stdout:
17− beets.ui._raw_main(['check', '--list-tools'])
pkgs/tools/audio/beets/plugins/check.nixdeleted−36
@@ -1,36 +0,0 @@
1−{ lib, fetchFromGitHub, beets, pythonPackages, flac, liboggz, mp3val }:
2−
3−pythonPackages.buildPythonApplication rec {
4− name = "beets-check";
5− version = "0.12.0";
6−
7− src = fetchFromGitHub {
8− repo = "beets-check";
9− owner = "geigerzaehler";
10− rev = "v${version}";
11− sha256 = "0b2ijjf0gycs6b40sm33ida3sjygjiv4spb5mba52vysc7iwmnjn";
12− };
13−
14− nativeBuildInputs = [ beets ];
15− checkInputs = [ pythonPackages.nose flac liboggz mp3val ];
16− propagatedBuildInputs = [ flac liboggz mp3val ];
17−
18− # patch out broken tests
19− patches = [ ./check-tests.patch ];
20−
21− # patch out futures dependency, it is only needed for Python2 which we don't
22− # support.
23− prePatch = ''
24− sed -i "/futures/d" setup.py
25− '';
26−
27− checkPhase = "nosetests";
28−
29− meta = with lib; {
30− description = "Beets plugin to Verify and store checksums in your library";
31− homepage = "https://github.com/geigerzaehler/beets-check";
32− license = licenses.mit;
33− maintainers = with maintainers; [ lovesegfault ];
34− broken = true;
35− };
36−}
pkgs/top-level/all-packages.nix−1
@@ -3036,7 +3036,6 @@ in
30363036 };
30373037 in lib.recurseIntoAttrs {
30383038 alternatives = callPackage ../tools/audio/beets/plugins/alternatives.nix pluginArgs;
3039− check = callPackage ../tools/audio/beets/plugins/check.nix pluginArgs;
30403039 copyartifacts = callPackage ../tools/audio/beets/plugins/copyartifacts.nix pluginArgs;
30413040 extrafiles = callPackage ../tools/audio/beets/plugins/extrafiles.nix pluginArgs;
30423041 };