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

Merge pull request #8524 from cpages/master 

abcde: update to 2.7 and fix mp3 tagging
This commit is contained in:
Carles Pagès 2015-06-30 15:04:47 +02:00
parent 2cdbe82ada 8658ab9675
commit 3dd09ed069
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/applications/audio/abcde/default.nix
View File

@ -1,18 +1,18 @@
{ stdenv, fetchurl, libcdio, cddiscid, wget, bash, vorbisTools, id3v2, lame, flac, eject, mkcue { stdenv, fetchurl, libcdio, cddiscid, wget, bash, vorbisTools, id3v2, eyeD3
, lame, flac, eject, mkcue
, perl, DigestSHA, MusicBrainz, MusicBrainzDiscID , perl, DigestSHA, MusicBrainz, MusicBrainzDiscID
, makeWrapper }: , makeWrapper }:
let version = "2.6"; let version = "2.7";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "abcde-${version}"; name = "abcde-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://debian/pool/main/a/abcde/abcde_${version}.orig.tar.gz"; url = "http://abcde.einval.com/download/abcde-${version}.tar.gz";
sha256 = "0y2cg233n2hixs0ji76dggpzgf52v4c4mnpwiai889ql2piafgk8"; sha256 = "0ikpffzvacadh6vj9qlary8126j1zrd2knp9gvivmp7y1656jj01";
}; };
# FIXME: This package does not support MP3 encoding (only Ogg), # FIXME: This package does not support `distmp3', `eject', etc.
# nor `distmp3', `eject', etc.
patches = [ ./abcde.patch ]; patches = [ ./abcde.patch ];
@ -50,7 +50,7 @@ in
--replace '#!/usr/bin/perl' '#!${perl}/bin/perl' --replace '#!/usr/bin/perl' '#!${perl}/bin/perl'
wrapProgram "$out/bin/abcde" --prefix PATH ":" \ wrapProgram "$out/bin/abcde" --prefix PATH ":" \
"$out/bin:${libcdio}/bin:${cddiscid}/bin:${wget}/bin:${vorbisTools}/bin:${id3v2}/bin:${lame}/bin" "$out/bin:${libcdio}/bin:${cddiscid}/bin:${wget}/bin:${vorbisTools}/bin:${id3v2}/bin:${eyeD3}/bin:${lame}/bin"
wrapProgram "$out/bin/cddb-tool" --prefix PATH ":" \ wrapProgram "$out/bin/cddb-tool" --prefix PATH ":" \
"${wget}/bin" "${wget}/bin"
@ -60,7 +60,7 @@ in
''; '';
meta = { meta = {
homepage = "http://lly.org/~rcw/abcde/page/"; homepage = http://abcde.einval.com/wiki/;
license = stdenv.lib.licenses.gpl2Plus; license = stdenv.lib.licenses.gpl2Plus;
description = "Command-line audio CD ripper"; description = "Command-line audio CD ripper";

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

@ -10564,6 +10564,7 @@ let
abcde = callPackage ../applications/audio/abcde { abcde = callPackage ../applications/audio/abcde {
inherit (perlPackages) DigestSHA MusicBrainz MusicBrainzDiscID; inherit (perlPackages) DigestSHA MusicBrainz MusicBrainzDiscID;
inherit (pythonPackages) eyeD3;
libcdio = libcdio082; libcdio = libcdio082;
}; };

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

@ -3057,20 +3057,21 @@ let
eyeD3 = buildPythonPackage rec { eyeD3 = buildPythonPackage rec {
version = "0.7.4"; version = "0.7.8";
name = "eyeD3-${version}"; name = "eyeD3-${version}";
disabled = isPyPy; disabled = isPyPy;
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "http://eyed3.nicfit.net/releases/${name}.tgz"; url = "http://eyed3.nicfit.net/releases/${name}.tar.gz";
sha256 = "001hzgqqnf2ig432mq78jsxidpky2rl2ilm28xwjp32vzphycf51"; sha256 = "1nv7nhfn1d0qm7rgkzksbccgqisng8klf97np0nwaqwd5dbmdf86";
}; };
buildInputs = with self; [ paver ]; buildInputs = with self; [ paver ];
postInstall = '' postInstall = ''
for prog in "$out/bin/"*; do for prog in "$out/bin/"*; do
wrapProgram "$prog" --prefix PYTHONPATH : "$PYTHONPATH" wrapProgram "$prog" --prefix PYTHONPATH : "$PYTHONPATH" \
--prefix PATH : ${python}/bin
done done
''; '';