public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #115446 from lovesegfault/beets-unstable-update

Browse Source 
beets: unstable-2021-01-29 -> unstable-2021-03-08
This commit is contained in:
Bernardo Meurer 2021-03-08 21:44:50 +00:00 committed by GitHub
commit 5e76186db4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
pkgs/tools/audio/beets/default.nix
View File

@ -8,6 +8,7 @@
, enableAbsubmit ? lib.elem stdenv.hostPlatform.system essentia-extractor.meta.platforms, essentia-extractor , enableAbsubmit ? lib.elem stdenv.hostPlatform.system essentia-extractor.meta.platforms, essentia-extractor
, enableAcousticbrainz ? true , enableAcousticbrainz ? true
, enableAcoustid ? true , enableAcoustid ? true
, enableAura ? true
, enableBadfiles ? true, flac, mp3val , enableBadfiles ? true, flac, mp3val
, enableBeatport ? true , enableBeatport ? true
, enableBpsync ? true , enableBpsync ? true
@ -31,7 +32,6 @@
# External plugins # External plugins
, enableAlternatives ? false , enableAlternatives ? false
, enableCheck ? false, liboggz
, enableCopyArtifacts ? false , enableCopyArtifacts ? false
, enableExtraFiles ? false , enableExtraFiles ? false
@ -44,6 +44,7 @@ let
optionalPlugins = { optionalPlugins = {
absubmit = enableAbsubmit; absubmit = enableAbsubmit;
acousticbrainz = enableAcousticbrainz; acousticbrainz = enableAcousticbrainz;
aura = enableAura;
badfiles = enableBadfiles; badfiles = enableBadfiles;
beatport = enableBeatport; beatport = enableBeatport;
bpsync = enableBpsync; bpsync = enableBpsync;
@ -102,13 +103,13 @@ in pythonPackages.buildPythonApplication rec {
# unstable does not require bs1770gain[2]. # unstable does not require bs1770gain[2].
# [1]: https://discourse.beets.io/t/forming-a-beets-core-team/639 # [1]: https://discourse.beets.io/t/forming-a-beets-core-team/639
# [2]: https://github.com/NixOS/nixpkgs/pull/90504 # [2]: https://github.com/NixOS/nixpkgs/pull/90504
version = "unstable-2021-01-29"; version = "unstable-2021-03-08";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "beetbox"; owner = "beetbox";
repo = "beets"; repo = "beets";
rev = "04ea754d00e2873ae9aa2d9e07c5cefd790eaee2"; rev = "debd382837ef1d30574c2234710d536bb299f979";
sha256 = "sha256-BIa3hnOsBxThbA2WCE4q9eaFNtObr3erZBBqobVOSiQ="; sha256 = "sha256-I6ejW3f72fdzWoz7g4n8pDYz2NiHGrorLegUQhQOSiI=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -126,31 +127,30 @@ in pythonPackages.buildPythonApplication rec {
pythonPackages.confuse pythonPackages.confuse
pythonPackages.mediafile pythonPackages.mediafile
gobject-introspection gobject-introspection
] ++ lib.optional enableAbsubmit essentia-extractor ] ++ lib.optional enableAbsubmit essentia-extractor
++ lib.optional enableAcoustid pythonPackages.pyacoustid ++ lib.optional enableAcoustid pythonPackages.pyacoustid
++ lib.optional enableBeatport pythonPackages.requests_oauthlib ++ lib.optional enableBeatport pythonPackages.requests_oauthlib
++ lib.optional (enableFetchart ++ lib.optional (enableFetchart
|| enableDeezer || enableDeezer
|| enableEmbyupdate || enableEmbyupdate
|| enableKodiupdate || enableKodiupdate
|| enableLoadext || enableLoadext
|| enablePlaylist || enablePlaylist
|| enableSubsonicplaylist || enableSubsonicplaylist
|| enableSubsonicupdate || enableSubsonicupdate
|| enableAcousticbrainz) || enableAcousticbrainz) pythonPackages.requests
pythonPackages.requests ++ lib.optional enableConvert ffmpeg
++ lib.optional enableCheck beetsExternalPlugins.check ++ lib.optional enableDiscogs pythonPackages.discogs_client
++ lib.optional enableConvert ffmpeg ++ lib.optional enableKeyfinder keyfinder-cli
++ lib.optional enableDiscogs pythonPackages.discogs_client ++ lib.optional enableLastfm pythonPackages.pylast
++ lib.optional enableKeyfinder keyfinder-cli ++ lib.optional enableMpd pythonPackages.mpd2
++ lib.optional enableLastfm pythonPackages.pylast ++ lib.optional enableSonosUpdate pythonPackages.soco
++ lib.optional enableMpd pythonPackages.mpd2 ++ lib.optional enableThumbnails pythonPackages.pyxdg
++ lib.optional enableSonosUpdate pythonPackages.soco ++ lib.optional (enableAura
++ lib.optional enableThumbnails pythonPackages.pyxdg || enableWeb) pythonPackages.flask
++ lib.optional enableWeb pythonPackages.flask ++ lib.optional enableAlternatives beetsExternalPlugins.alternatives
++ lib.optional enableAlternatives beetsExternalPlugins.alternatives ++ lib.optional enableCopyArtifacts beetsExternalPlugins.copyartifacts
++ lib.optional enableCopyArtifacts beetsExternalPlugins.copyartifacts ++ lib.optional enableExtraFiles beetsExternalPlugins.extrafiles
++ lib.optional enableExtraFiles beetsExternalPlugins.extrafiles
; ;
buildInputs = [ buildInputs = [

17
pkgs/tools/audio/beets/plugins/check-tests.patch
View File

@ -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'])

36
pkgs/tools/audio/beets/plugins/check.nix
View File

@ -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;
};
}

1
pkgs/top-level/all-packages.nix
View File

@ -3036,7 +3036,6 @@ in
}; };
in lib.recurseIntoAttrs { in lib.recurseIntoAttrs {
alternatives = callPackage ../tools/audio/beets/plugins/alternatives.nix pluginArgs; 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; copyartifacts = callPackage ../tools/audio/beets/plugins/copyartifacts.nix pluginArgs;
extrafiles = callPackage ../tools/audio/beets/plugins/extrafiles.nix pluginArgs; extrafiles = callPackage ../tools/audio/beets/plugins/extrafiles.nix pluginArgs;
}; };