ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-29 06:45:54 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8105 from codyopel/beets

Browse Source 
Updated Beets and dependenecies
This commit is contained in:
William A. Kennington III 2015-06-04 23:59:14 -07:00
commit 04f0ab105c
2 changed files with 38 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, writeScript, glibcLocales { stdenv, fetchFromGitHub, writeScript, glibcLocales
, buildPythonPackage, pythonPackages, python , buildPythonPackage, pythonPackages, python, imagemagick
, enableAcoustid ? true , enableAcoustid ? true
, enableDiscogs ? true , enableDiscogs ? true
@ -45,8 +45,9 @@ let
"bench" "bpd" "bpm" "bucket" "convert" "cue" "duplicates" "embedart" "bench" "bpd" "bpm" "bucket" "convert" "cue" "duplicates" "embedart"
"filefilter" "freedesktop" "fromfilename" "ftintitle" "fuzzy" "ihate" "filefilter" "freedesktop" "fromfilename" "ftintitle" "fuzzy" "ihate"
"importadded" "importfeeds" "info" "inline" "keyfinder" "lyrics" "importadded" "importfeeds" "info" "inline" "keyfinder" "lyrics"
"mbcollection" "mbsync" "missing" "permissions" "play" "plexupdate" "random" "mbcollection" "mbsync" "metasync" "missing" "permissions" "play"
"rewrite" "scrub" "smartplaylist" "spotify" "the" "types" "zero" "plexupdate" "random" "rewrite" "scrub" "smartplaylist" "spotify" "the"
"types" "zero"
]; ];
enabledOptionalPlugins = attrNames (filterAttrs (_: id) optionalPlugins); enabledOptionalPlugins = attrNames (filterAttrs (_: id) optionalPlugins);
@ -59,18 +60,19 @@ let
in buildPythonPackage rec { in buildPythonPackage rec {
name = "beets-${version}"; name = "beets-${version}";
version = "1.3.11"; version = "1.3.13";
namePrefix = ""; namePrefix = "";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sampsyo"; owner = "sampsyo";
repo = "beets"; repo = "beets";
rev = "v${version}"; rev = "v${version}";
sha256 = "16jb1frds9vl40n9hy18x9xipxfzln3ym823vx8jymhv3by8p62m"; sha256 = "05gnp0y3n1jl7fnyslx56x2lsp8f4mv3xwy7gbyghax0vs3ccfvl";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
pythonPackages.enum34 pythonPackages.enum34
pythonPackages.jellyfish
pythonPackages.munkres pythonPackages.munkres
pythonPackages.musicbrainzngs pythonPackages.musicbrainzngs
pythonPackages.mutagen pythonPackages.mutagen
@ -91,13 +93,10 @@ in buildPythonPackage rec {
buildInputs = with pythonPackages; [ buildInputs = with pythonPackages; [
beautifulsoup4 beautifulsoup4
flask imagemagick
mock mock
nose nose
pyechonest
pylast
rarfile rarfile
requests2
responses responses
]; ];
@ -165,9 +164,9 @@ in buildPythonPackage rec {
''; '';
meta = { meta = {
homepage = http://beets.radbox.org;
description = "Music tagger and library organizer"; description = "Music tagger and library organizer";
license = stdenv.lib.licenses.mit; homepage = http://beets.radbox.org;
maintainers = with stdenv.lib.maintainers; [ iElectric aszlig pjones ]; license = licenses.mit;
maintainers = with maintainers; [ aszlig iElectric pjones ];
}; };
} }

36
pkgs/top-level/python-packages.nix
View File

@ -1057,17 +1057,17 @@ let
}; };
responses = self.buildPythonPackage rec { responses = self.buildPythonPackage rec {
name = "responses-0.2.2"; name = "responses-0.4.0";
propagatedBuildInputs = with self; [ requests mock six pytest flake8 ];
doCheck = false;
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "https://pypi.python.org/packages/source/r/responses/responses-0.2.2.tar.gz"; url = "https://pypi.python.org/packages/source/r/responses/${name}.tar.gz";
md5 = "5d79fd425cf8d858dfc8afa6475395d3"; sha256 = "0fs7a4cf4f12mjhcjd5vfh0f3ixcy2nawzxpgsfr3ahf0rg7ppx5";
}; };
propagatedBuildInputs = with self; [ cookies mock requests2 six ];
doCheck = false;
}; };
rarfile = self.buildPythonPackage rec { rarfile = self.buildPythonPackage rec {
@ -2008,6 +2008,23 @@ let
}; };
}; };
cookies = buildPythonPackage rec {
name = "cookies-2.2.1";
src = pkgs.fetchurl {
url = "https://pypi.python.org/packages/source/c/cookies/${name}.tar.gz";
sha256 = "13pfndz8vbk4p2a44cfbjsypjarkrall71pgc97glk5fiiw9idnn";
};
doCheck = false;
meta = {
description = "Friendlier RFC 6265-compliant cookie parser/renderer";
homepage = https://github.com/sashahart/cookies;
license = licenses.mit;
};
};
coverage = buildPythonPackage rec { coverage = buildPythonPackage rec {
name = "coverage-3.7.1"; name = "coverage-3.7.1";
@ -10620,16 +10637,17 @@ let
requests2 = buildPythonPackage rec { requests2 = buildPythonPackage rec {
name = "requests-${version}"; name = "requests-${version}";
version = "2.6.0"; version = "2.7.0";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "http://pypi.python.org/packages/source/r/requests/${name}.tar.gz"; url = "http://pypi.python.org/packages/source/r/requests/${name}.tar.gz";
sha256 = "0xadnw27m257scrhjcc66zm4z3ikg8n9h6g9akpkavr31qgyvnqw"; sha256 = "0gdr9dxm24amxpbyqpbh3lbwxc2i42hnqv50sigx568qssv3v2ir";
}; };
meta = { meta = {
description = "An Apache2 licensed HTTP library, written in Python, for human beings"; description = "An Apache2 licensed HTTP library, written in Python, for human beings";
homepage = http://docs.python-requests.org/en/latest/; homepage = http://docs.python-requests.org/en/latest/;
license = licenses.asl20;
}; };
}; };