beets: Update to new upstream version 1.3.11
Adds glibcLocales as a dependency so that the unit tests with UTF-8 strings will work correctly.
This commit is contained in:
parent
311aa5d8d9
commit
b836ab365b
@ -1,26 +1,26 @@
|
|||||||
{ 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 enableThumbnails -> pythonPackages.pyxdg != null;
|
||||||
assert enableReplaygain -> pythonPackages.audiotools != null;
|
assert enableReplaygain -> pythonPackages.audiotools != null;
|
||||||
assert enableWeb -> pythonPackages.flask != null;
|
assert enableWeb -> pythonPackages.flask != null;
|
||||||
|
|
||||||
@ -28,7 +28,6 @@ with stdenv.lib;
|
|||||||
|
|
||||||
let
|
let
|
||||||
optionalPlugins = {
|
optionalPlugins = {
|
||||||
beatport = enableBeatport;
|
|
||||||
chroma = enableAcoustid;
|
chroma = enableAcoustid;
|
||||||
discogs = enableDiscogs;
|
discogs = enableDiscogs;
|
||||||
echonest = enableEchonest;
|
echonest = enableEchonest;
|
||||||
@ -38,12 +37,13 @@ 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" "freedesktop"
|
||||||
"fromfilename" "ftintitle" "fuzzy" "ihate" "importadded" "importfeeds"
|
"fromfilename" "filefilter" "ftintitle" "fuzzy" "ihate" "importadded" "importfeeds"
|
||||||
"info" "inline" "keyfinder" "lyrics" "mbcollection" "mbsync" "missing"
|
"info" "inline" "keyfinder" "lyrics" "mbcollection" "mbsync" "missing"
|
||||||
"permissions" "play" "plexupdate" "random" "rewrite" "scrub" "smartplaylist"
|
"permissions" "play" "plexupdate" "random" "rewrite" "scrub" "smartplaylist"
|
||||||
"spotify" "the" "types" "zero"
|
"spotify" "the" "types" "zero"
|
||||||
@ -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,16 +74,18 @@ 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 enableThumbnails pythonPackages.pyxdg
|
||||||
++ optional enableReplaygain pythonPackages.audiotools
|
++ optional enableReplaygain pythonPackages.audiotools
|
||||||
++ optional enableWeb pythonPackages.flask;
|
++ optional enableWeb pythonPackages.flask;
|
||||||
|
|
||||||
@ -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)" \
|
||||||
@ -160,10 +164,12 @@ in buildPythonPackage rec {
|
|||||||
runHook postInstallCheck
|
runHook postInstallCheck
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
LANG = null;
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
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 ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user