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

Merge pull request #7367 plus own fixes. 

This introduces beets 1.3.11, changes can be found at:

https://github.com/sampsyo/beets/releases/tag/v1.3.11

Thanks to @pjones for the pull request, which also adds him to the
maintainers.

My changes on the other hand are only of cosmetic nature and do not
change anything in functionality.
This commit is contained in:
aszlig 2015-04-14 09:45:29 +02:00
parent 311aa5d8d9 17ea86d947
commit b1730f47e0
No known key found for this signature in database
GPG Key ID: D0EBD0EC8C2DC961
1 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,34 +1,33 @@
{ stdenv, fetchFromGitHub, writeScript { stdenv, fetchFromGitHub, writeScript, glibcLocales
, buildPythonPackage, pythonPackages, python , buildPythonPackage, pythonPackages, python
, enableAcoustid ? true , enableAcoustid ? true
, enableBeatport ? true
, enableDiscogs ? true , enableDiscogs ? true
, enableEchonest ? true , enableEchonest ? true
, enableFetchart ? true , enableFetchart ? true
, enableLastfm ? true , enableLastfm ? true
, enableMpd ? true , enableMpd ? true
, enableReplaygain ? true , enableReplaygain ? true
, enableThumbnails ? true
, enableWeb ? true , enableWeb ? true
, bashInteractive, bashCompletion , bashInteractive, bashCompletion
}: }:
assert enableAcoustid -> pythonPackages.pyacoustid != null; assert enableAcoustid -> pythonPackages.pyacoustid != null;
assert enableBeatport -> pythonPackages.responses != null;
assert enableDiscogs -> pythonPackages.discogs_client != null; assert enableDiscogs -> pythonPackages.discogs_client != null;
assert enableEchonest -> pythonPackages.pyechonest != null; assert enableEchonest -> pythonPackages.pyechonest != null;
assert enableFetchart -> pythonPackages.responses != null; assert enableFetchart -> pythonPackages.responses != null;
assert enableLastfm -> pythonPackages.pylast != null; assert enableLastfm -> pythonPackages.pylast != null;
assert enableMpd -> pythonPackages.mpd != null; assert enableMpd -> pythonPackages.mpd != null;
assert enableReplaygain -> pythonPackages.audiotools != null; assert enableReplaygain -> pythonPackages.audiotools != null;
assert enableThumbnails -> pythonPackages.pyxdg != null;
assert enableWeb -> pythonPackages.flask != null; assert enableWeb -> pythonPackages.flask != null;
with stdenv.lib; with stdenv.lib;
let let
optionalPlugins = { optionalPlugins = {
beatport = enableBeatport;
chroma = enableAcoustid; chroma = enableAcoustid;
discogs = enableDiscogs; discogs = enableDiscogs;
echonest = enableEchonest; echonest = enableEchonest;
@ -38,15 +37,16 @@ let
mpdstats = enableMpd; mpdstats = enableMpd;
mpdupdate = enableMpd; mpdupdate = enableMpd;
replaygain = enableReplaygain; replaygain = enableReplaygain;
thumbnails = enableThumbnails;
web = enableWeb; web = enableWeb;
}; };
pluginsWithoutDeps = [ pluginsWithoutDeps = [
"bench" "bpd" "bpm" "bucket" "convert" "duplicates" "embedart" "freedesktop" "bench" "bpd" "bpm" "bucket" "convert" "cue" "duplicates" "embedart"
"fromfilename" "ftintitle" "fuzzy" "ihate" "importadded" "importfeeds" "filefilter" "freedesktop" "fromfilename" "ftintitle" "fuzzy" "ihate"
"info" "inline" "keyfinder" "lyrics" "mbcollection" "mbsync" "missing" "importadded" "importfeeds" "info" "inline" "keyfinder" "lyrics"
"permissions" "play" "plexupdate" "random" "rewrite" "scrub" "smartplaylist" "mbcollection" "mbsync" "missing" "permissions" "play" "plexupdate" "random"
"spotify" "the" "types" "zero" "rewrite" "scrub" "smartplaylist" "spotify" "the" "types" "zero"
]; ];
enabledOptionalPlugins = attrNames (filterAttrs (_: id) optionalPlugins); enabledOptionalPlugins = attrNames (filterAttrs (_: id) optionalPlugins);
@ -59,14 +59,14 @@ let
in buildPythonPackage rec { in buildPythonPackage rec {
name = "beets-${version}"; name = "beets-${version}";
version = "1.3.10"; version = "1.3.11";
namePrefix = ""; namePrefix = "";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sampsyo"; owner = "sampsyo";
repo = "beets"; repo = "beets";
rev = "v${version}"; rev = "v${version}";
sha256 = "136rvzpygjym6hxq19qwiri5jxx718bbmi471mvc3vibrb7xj1sr"; sha256 = "16jb1frds9vl40n9hy18x9xipxfzln3ym823vx8jymhv3by8p62m";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -74,18 +74,20 @@ in buildPythonPackage rec {
pythonPackages.munkres pythonPackages.munkres
pythonPackages.musicbrainzngs pythonPackages.musicbrainzngs
pythonPackages.mutagen pythonPackages.mutagen
pythonPackages.pathlib
pythonPackages.pyyaml pythonPackages.pyyaml
pythonPackages.unidecode pythonPackages.unidecode
python.modules.sqlite3 python.modules.sqlite3
python.modules.readline python.modules.readline
] ++ optional enableAcoustid pythonPackages.pyacoustid ] ++ optional enableAcoustid pythonPackages.pyacoustid
++ optional (enableBeatport || enableFetchart) pythonPackages.requests2 ++ optional enableFetchart pythonPackages.requests2
++ optional enableDiscogs pythonPackages.discogs_client ++ optional enableDiscogs pythonPackages.discogs_client
++ optional enableEchonest pythonPackages.pyechonest ++ optional enableEchonest pythonPackages.pyechonest
++ optional enableLastfm pythonPackages.pylast ++ optional enableLastfm pythonPackages.pylast
++ optional enableMpd pythonPackages.mpd ++ optional enableMpd pythonPackages.mpd
++ optional enableReplaygain pythonPackages.audiotools ++ optional enableReplaygain pythonPackages.audiotools
++ optional enableWeb pythonPackages.flask; ++ optional enableThumbnails pythonPackages.pyxdg
++ optional enableWeb pythonPackages.flask;
buildInputs = with pythonPackages; [ buildInputs = with pythonPackages; [
beautifulsoup4 beautifulsoup4
@ -134,6 +136,8 @@ in buildPythonPackage rec {
checkPhase = '' checkPhase = ''
runHook preCheck runHook preCheck
LANG=en_US.UTF-8 \
LOCALE_ARCHIVE=${glibcLocales}/lib/locale/locale-archive \
BEETS_TEST_SHELL="${testShell}" \ BEETS_TEST_SHELL="${testShell}" \
BASH_COMPLETION_SCRIPT="${completion}" \ BASH_COMPLETION_SCRIPT="${completion}" \
HOME="$(mktemp -d)" \ HOME="$(mktemp -d)" \
@ -164,6 +168,6 @@ in buildPythonPackage rec {
homepage = http://beets.radbox.org; homepage = http://beets.radbox.org;
description = "Music tagger and library organizer"; description = "Music tagger and library organizer";
license = stdenv.lib.licenses.mit; license = stdenv.lib.licenses.mit;
maintainers = with stdenv.lib.maintainers; [ iElectric aszlig ]; maintainers = with stdenv.lib.maintainers; [ iElectric aszlig pjones ];
}; };
} }