beets: use python2

This commit is contained in:
Frederik Rietdijk 2016-11-09 12:11:07 +01:00
parent e77a14b24b
commit 599312739e

View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, writeScript, glibcLocales { stdenv, fetchFromGitHub, writeScript, glibcLocales
, pythonPackages, imagemagick , python2Packages, imagemagick
, enableAcousticbrainz ? true , enableAcousticbrainz ? true
, enableAcoustid ? true , enableAcoustid ? true
@ -22,17 +22,17 @@
, bashInteractive, bash-completion , bashInteractive, bash-completion
}: }:
assert enableAcoustid -> pythonPackages.pyacoustid != null; assert enableAcoustid -> python2Packages.pyacoustid != null;
assert enableBadfiles -> flac != null && mp3val != null; assert enableBadfiles -> flac != null && mp3val != null;
assert enableConvert -> ffmpeg != null; assert enableConvert -> ffmpeg != null;
assert enableDiscogs -> pythonPackages.discogs_client != null; assert enableDiscogs -> python2Packages.discogs_client != null;
assert enableFetchart -> pythonPackages.responses != null; assert enableFetchart -> python2Packages.responses != null;
assert enableKeyfinder -> keyfinder-cli != null; assert enableKeyfinder -> keyfinder-cli != null;
assert enableLastfm -> pythonPackages.pylast != null; assert enableLastfm -> python2Packages.pylast != null;
assert enableMpd -> pythonPackages.mpd != null; assert enableMpd -> python2Packages.mpd != null;
assert enableReplaygain -> bs1770gain != null; assert enableReplaygain -> bs1770gain != null;
assert enableThumbnails -> pythonPackages.pyxdg != null; assert enableThumbnails -> python2Packages.pyxdg != null;
assert enableWeb -> pythonPackages.flask != null; assert enableWeb -> python2Packages.flask != null;
with stdenv.lib; with stdenv.lib;
@ -72,7 +72,7 @@ let
testShell = "${bashInteractive}/bin/bash --norc"; testShell = "${bashInteractive}/bin/bash --norc";
completion = "${bash-completion}/share/bash-completion/bash_completion"; completion = "${bash-completion}/share/bash-completion/bash_completion";
in pythonPackages.buildPythonApplication rec { in python2Packages.buildPythonApplication rec {
name = "beets-${version}"; name = "beets-${version}";
version = "1.3.19"; version = "1.3.19";
@ -84,34 +84,34 @@ in pythonPackages.buildPythonApplication rec {
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
pythonPackages.enum34 python2Packages.enum34
pythonPackages.jellyfish python2Packages.jellyfish
pythonPackages.munkres python2Packages.munkres
pythonPackages.musicbrainzngs python2Packages.musicbrainzngs
pythonPackages.mutagen python2Packages.mutagen
pythonPackages.pathlib python2Packages.pathlib
pythonPackages.pyyaml python2Packages.pyyaml
pythonPackages.unidecode python2Packages.unidecode
] ++ optional enableAcoustid pythonPackages.pyacoustid ] ++ optional enableAcoustid python2Packages.pyacoustid
++ optional (enableFetchart ++ optional (enableFetchart
|| enableEmbyupdate || enableEmbyupdate
|| enableAcousticbrainz) || enableAcousticbrainz)
pythonPackages.requests2 python2Packages.requests2
++ optional enableConvert ffmpeg ++ optional enableConvert ffmpeg
++ optional enableDiscogs pythonPackages.discogs_client ++ optional enableDiscogs python2Packages.discogs_client
++ optional enableKeyfinder keyfinder-cli ++ optional enableKeyfinder keyfinder-cli
++ optional enableLastfm pythonPackages.pylast ++ optional enableLastfm python2Packages.pylast
++ optional enableMpd pythonPackages.mpd ++ optional enableMpd python2Packages.mpd
++ optional enableThumbnails pythonPackages.pyxdg ++ optional enableThumbnails python2Packages.pyxdg
++ optional enableWeb pythonPackages.flask ++ optional enableWeb python2Packages.flask
++ optional enableAlternatives (import ./alternatives-plugin.nix { ++ optional enableAlternatives (import ./alternatives-plugin.nix {
inherit stdenv pythonPackages fetchFromGitHub; inherit stdenv python2Packages fetchFromGitHub;
}) })
++ optional enableCopyArtifacts (import ./copyartifacts-plugin.nix { ++ optional enableCopyArtifacts (import ./copyartifacts-plugin.nix {
inherit stdenv pythonPackages fetchFromGitHub; inherit stdenv python2Packages fetchFromGitHub;
}); });
buildInputs = with pythonPackages; [ buildInputs = with python2Packages; [
beautifulsoup4 beautifulsoup4
imagemagick imagemagick
mock mock