From 6beb35e3441ed42cfafaf0d4be2688ef9b3bb754 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 8 Mar 2021 11:29:30 -0800 Subject: [PATCH 1/2] beets: unstable-2021-01-29 -> unstable-2021-03-08 --- pkgs/tools/audio/beets/default.nix | 56 ++++++++++++++++-------------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 5cae647cf8f7..4f759324d5e3 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -8,6 +8,7 @@ , enableAbsubmit ? lib.elem stdenv.hostPlatform.system essentia-extractor.meta.platforms, essentia-extractor , enableAcousticbrainz ? true , enableAcoustid ? true +, enableAura ? true , enableBadfiles ? true, flac, mp3val , enableBeatport ? true , enableBpsync ? true @@ -44,6 +45,7 @@ let optionalPlugins = { absubmit = enableAbsubmit; acousticbrainz = enableAcousticbrainz; + aura = enableAura; badfiles = enableBadfiles; beatport = enableBeatport; bpsync = enableBpsync; @@ -102,13 +104,13 @@ in pythonPackages.buildPythonApplication rec { # unstable does not require bs1770gain[2]. # [1]: https://discourse.beets.io/t/forming-a-beets-core-team/639 # [2]: https://github.com/NixOS/nixpkgs/pull/90504 - version = "unstable-2021-01-29"; + version = "unstable-2021-03-08"; src = fetchFromGitHub { owner = "beetbox"; repo = "beets"; - rev = "04ea754d00e2873ae9aa2d9e07c5cefd790eaee2"; - sha256 = "sha256-BIa3hnOsBxThbA2WCE4q9eaFNtObr3erZBBqobVOSiQ="; + rev = "debd382837ef1d30574c2234710d536bb299f979"; + sha256 = "sha256-I6ejW3f72fdzWoz7g4n8pDYz2NiHGrorLegUQhQOSiI="; }; propagatedBuildInputs = [ @@ -126,31 +128,31 @@ in pythonPackages.buildPythonApplication rec { pythonPackages.confuse pythonPackages.mediafile gobject-introspection - ] ++ lib.optional enableAbsubmit essentia-extractor - ++ lib.optional enableAcoustid pythonPackages.pyacoustid - ++ lib.optional enableBeatport pythonPackages.requests_oauthlib + ] ++ lib.optional enableAbsubmit essentia-extractor + ++ lib.optional enableAcoustid pythonPackages.pyacoustid + ++ lib.optional enableBeatport pythonPackages.requests_oauthlib ++ lib.optional (enableFetchart - || enableDeezer - || enableEmbyupdate - || enableKodiupdate - || enableLoadext - || enablePlaylist - || enableSubsonicplaylist - || enableSubsonicupdate - || enableAcousticbrainz) - pythonPackages.requests - ++ lib.optional enableCheck beetsExternalPlugins.check - ++ lib.optional enableConvert ffmpeg - ++ lib.optional enableDiscogs pythonPackages.discogs_client - ++ lib.optional enableKeyfinder keyfinder-cli - ++ lib.optional enableLastfm pythonPackages.pylast - ++ lib.optional enableMpd pythonPackages.mpd2 - ++ lib.optional enableSonosUpdate pythonPackages.soco - ++ lib.optional enableThumbnails pythonPackages.pyxdg - ++ lib.optional enableWeb pythonPackages.flask - ++ lib.optional enableAlternatives beetsExternalPlugins.alternatives - ++ lib.optional enableCopyArtifacts beetsExternalPlugins.copyartifacts - ++ lib.optional enableExtraFiles beetsExternalPlugins.extrafiles + || enableDeezer + || enableEmbyupdate + || enableKodiupdate + || enableLoadext + || enablePlaylist + || enableSubsonicplaylist + || enableSubsonicupdate + || enableAcousticbrainz) pythonPackages.requests + ++ lib.optional enableCheck beetsExternalPlugins.check + ++ lib.optional enableConvert ffmpeg + ++ lib.optional enableDiscogs pythonPackages.discogs_client + ++ lib.optional enableKeyfinder keyfinder-cli + ++ lib.optional enableLastfm pythonPackages.pylast + ++ lib.optional enableMpd pythonPackages.mpd2 + ++ lib.optional enableSonosUpdate pythonPackages.soco + ++ lib.optional enableThumbnails pythonPackages.pyxdg + ++ lib.optional (enableAura + || enableWeb) pythonPackages.flask + ++ lib.optional enableAlternatives beetsExternalPlugins.alternatives + ++ lib.optional enableCopyArtifacts beetsExternalPlugins.copyartifacts + ++ lib.optional enableExtraFiles beetsExternalPlugins.extrafiles ; buildInputs = [ From a2492b0831915aa9a24cdc4ff96b1288241898c7 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 8 Mar 2021 12:42:29 -0800 Subject: [PATCH 2/2] beetsExternalPlugins.check: remove (broken) --- pkgs/tools/audio/beets/default.nix | 2 -- .../audio/beets/plugins/check-tests.patch | 17 --------- pkgs/tools/audio/beets/plugins/check.nix | 36 ------------------- pkgs/top-level/all-packages.nix | 1 - 4 files changed, 56 deletions(-) delete mode 100644 pkgs/tools/audio/beets/plugins/check-tests.patch delete mode 100644 pkgs/tools/audio/beets/plugins/check.nix diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 4f759324d5e3..61340938f51e 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -32,7 +32,6 @@ # External plugins , enableAlternatives ? false -, enableCheck ? false, liboggz , enableCopyArtifacts ? false , enableExtraFiles ? false @@ -140,7 +139,6 @@ in pythonPackages.buildPythonApplication rec { || enableSubsonicplaylist || enableSubsonicupdate || enableAcousticbrainz) pythonPackages.requests - ++ lib.optional enableCheck beetsExternalPlugins.check ++ lib.optional enableConvert ffmpeg ++ lib.optional enableDiscogs pythonPackages.discogs_client ++ lib.optional enableKeyfinder keyfinder-cli diff --git a/pkgs/tools/audio/beets/plugins/check-tests.patch b/pkgs/tools/audio/beets/plugins/check-tests.patch deleted file mode 100644 index 2de97b86c8b4..000000000000 --- a/pkgs/tools/audio/beets/plugins/check-tests.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/test/cli_test.py b/test/cli_test.py -index 26df140..2eb913c 100644 ---- a/test/cli_test.py -+++ b/test/cli_test.py -@@ -372,12 +372,6 @@ class ToolListTest(TestHelper, TestCase): - self.assertIn('flac', stdout.getvalue()) - self.assertIn('oggz-validate', stdout.getvalue()) - -- def test_found_mp3val(self): -- shutil.copy('/bin/echo', os.path.join(self.temp_dir, 'mp3val')) -- with captureStdout() as stdout: -- beets.ui._raw_main(['check', '--list-tools']) -- self.assertRegexpMatches(stdout.getvalue(), r'mp3val *found') -- - def test_oggz_validate_not_found(self): - with captureStdout() as stdout: - beets.ui._raw_main(['check', '--list-tools']) diff --git a/pkgs/tools/audio/beets/plugins/check.nix b/pkgs/tools/audio/beets/plugins/check.nix deleted file mode 100644 index a575836ef388..000000000000 --- a/pkgs/tools/audio/beets/plugins/check.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, fetchFromGitHub, beets, pythonPackages, flac, liboggz, mp3val }: - -pythonPackages.buildPythonApplication rec { - name = "beets-check"; - version = "0.12.0"; - - src = fetchFromGitHub { - repo = "beets-check"; - owner = "geigerzaehler"; - rev = "v${version}"; - sha256 = "0b2ijjf0gycs6b40sm33ida3sjygjiv4spb5mba52vysc7iwmnjn"; - }; - - nativeBuildInputs = [ beets ]; - checkInputs = [ pythonPackages.nose flac liboggz mp3val ]; - propagatedBuildInputs = [ flac liboggz mp3val ]; - - # patch out broken tests - patches = [ ./check-tests.patch ]; - - # patch out futures dependency, it is only needed for Python2 which we don't - # support. - prePatch = '' - sed -i "/futures/d" setup.py - ''; - - checkPhase = "nosetests"; - - meta = with lib; { - description = "Beets plugin to Verify and store checksums in your library"; - homepage = "https://github.com/geigerzaehler/beets-check"; - license = licenses.mit; - maintainers = with maintainers; [ lovesegfault ]; - broken = true; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3c8e41f88e39..079295366ff6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3034,7 +3034,6 @@ in }; in lib.recurseIntoAttrs { alternatives = callPackage ../tools/audio/beets/plugins/alternatives.nix pluginArgs; - check = callPackage ../tools/audio/beets/plugins/check.nix pluginArgs; copyartifacts = callPackage ../tools/audio/beets/plugins/copyartifacts.nix pluginArgs; extrafiles = callPackage ../tools/audio/beets/plugins/extrafiles.nix pluginArgs; };